Mon Jul 20 11:30:54 2015 UTC ()
Instead of having only lua.pc, provide both the versioned pkg-config file
and the unversioned one.
As discussed on tech-pkg.
(wiz)
diff -r1.17 -r1.18 pkgsrc/lang/lua/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/lang/lua51/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/lang/lua52/buildlink3.mk
diff -r1.1.1.1 -r1.2 pkgsrc/lang/lua53/buildlink3.mk
--- pkgsrc/lang/lua/buildlink3.mk 2013/10/30 06:18:09 1.17
+++ pkgsrc/lang/lua/buildlink3.mk 2015/07/20 11:30:54 1.18
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2013/10/30 06:18:09 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2015/07/20 11:30:54 wiz Exp $
#
# This is a fake buildlink3.mk file. It figures out the Lua version
# and then includes the real buildlink3.mk file for that Lua version.
@@ -10,3 +10,12 @@
.include "${LUA_PKGSRCDIR}/buildlink3.mk"
BUILDLINK_PREFIX.lua= ${BUILDLINK_PREFIX.${LUA_PACKAGE}}
+
+.if !defined(LUA_BUILDLINK3_MK)
+LUA_BUILDLINK3_MK:=
+
+BUILDLINK_TARGETS+= buildlink-bin-unversioned
+
+buildlink-bin-unversioned:
+ ${LN} -s ${BUILDLINK_DIR}/lib/pkgconfig/lua-${_LUA_DOT_VERSION}.pc ${BUILDLINK_DIR}/lib/pkgconfig/lua.pc
+.endif # LUA_BUILDLINK3_MK
--- pkgsrc/lang/lua51/buildlink3.mk 2014/05/03 13:00:44 1.3
+++ pkgsrc/lang/lua51/buildlink3.mk 2015/07/20 11:30:54 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:44 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
BUILDLINK_TREE+= lua51
@@ -15,8 +15,6 @@
# -llua -> -llua5.1
BUILDLINK_TRANSFORM+= l:lua:lua5.1
BUILDLINK_INCDIRS.lua51+= include/lua-5.1
-
-BUILDLINK_FNAME_TRANSFORM.lua51+= -e 's|lib/pkgconfig/lua-5.1.pc|lib/pkgconfig/lua.pc|'
.include "../../mk/readline.buildlink3.mk"
.endif # LUA51_BUILDLINK3_MK
--- pkgsrc/lang/lua52/buildlink3.mk 2014/05/03 13:00:45 1.3
+++ pkgsrc/lang/lua52/buildlink3.mk 2015/07/20 11:30:54 1.4
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2014/05/03 13:00:45 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2015/07/20 11:30:54 wiz Exp $
BUILDLINK_TREE+= lua52
@@ -15,8 +15,6 @@
# -llua -> -llua5.2
BUILDLINK_TRANSFORM+= l:lua:lua5.2
BUILDLINK_INCDIRS.lua52+= include/lua-5.2
-
-BUILDLINK_FNAME_TRANSFORM.lua52+= -e 's|lib/pkgconfig/lua-5.2.pc|lib/pkgconfig/lua.pc|'
.include "../../mk/readline.buildlink3.mk"
.endif # LUA52_BUILDLINK3_MK
--- pkgsrc/lang/lua53/buildlink3.mk 2015/01/17 17:50:23 1.1.1.1
+++ pkgsrc/lang/lua53/buildlink3.mk 2015/07/20 11:30:54 1.2
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2015/01/17 17:50:23 alnsn Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2015/07/20 11:30:54 wiz Exp $
BUILDLINK_TREE+= lua53
@@ -15,8 +15,6 @@
# -llua -> -llua5.3
BUILDLINK_TRANSFORM+= l:lua:lua5.3
BUILDLINK_INCDIRS.lua53+= include/lua-5.3
-
-BUILDLINK_FNAME_TRANSFORM.lua53+= -e 's|lib/pkgconfig/lua-5.3.pc|lib/pkgconfig/lua.pc|'
.include "../../mk/readline.buildlink3.mk"
.endif # LUA53_BUILDLINK3_MK