Don't try to strip Perl scripts. Pass down -export-dynamic as linker

flag.

4 files changed, 91 insertions, 2 deletions

diff --git a/lang/yap/distinfo b/lang/yap/distinfo
index 369abc4eb89..c76b70111d6 100644
--- a/lang/yap/distinfo
+++ b/lang/yap/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2013/06/12 20:28:41 asau Exp $
+$NetBSD: distinfo,v 1.16 2013/06/13 21:44:06 joerg Exp $
 
 SHA1 (yap-6.3.3.tar.gz) = d191e419e5cf74b11e003aae5fe148f3f2f26ac5
 RMD160 (yap-6.3.3.tar.gz) = 6c92880670d58b1e885cbb52709b61773db65808
@@ -9,4 +9,6 @@ SHA1 (patch-ae) = 1bc060490ff5e2ba698a4f680a6d030f69683e01
 SHA1 (patch-af) = a042950ee63fac0f5863c3caa3f7c07227c46b4b
 SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648
 SHA1 (patch-aj) = 9d8c1cde65c52f963f72b4f5364e611db96e59c7
-SHA1 (patch-packages_pldoc_Makefile.in) = b4c5fe1bd49fd29498b106615ee8015161e5211b
+SHA1 (patch-configure) = a88448bb21ba103fab3579dfec7e9dbc812491f3
+SHA1 (patch-configure.in) = cbe3f2f503ba56c953fa4454881ea4917f275460
+SHA1 (patch-packages_pldoc_Makefile.in) = 821a281c2066f6ebb7e03e197e3e5eb32ac299e8
diff --git a/lang/yap/patches/patch-configure b/lang/yap/patches/patch-configure
new file mode 100644
index 00000000000..663718a276c
--- /dev/null
+++ b/lang/yap/patches/patch-configure
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure,v 1.1 2013/06/13 21:44:06 joerg Exp $
+
+--- configure.orig	2013-06-13 17:40:09.000000000 +0000
++++ configure
+@@ -8099,8 +8099,8 @@ fi
+           if test "$have_dl" = "yes"
+ 	  then
+ 	    SO="so"
+-            SHLIB_LD="$CC -shared -export-dynamic"
+-            SHLIB_CXX_LD="$CXX -shared -export-dynamic"
++            SHLIB_LD="$CC -shared -Wl,-export-dynamic"
++            SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"
+             DO_SECOND_LD=""
+ 	    LIBS="$LIBS -ldl"
+ 	    case "$target_cpu" in
+@@ -8170,8 +8170,8 @@ fi
+ 	  then
+ 	    #this tells ld to export all non-static symbols,
+ 	    #otherwise no external predicates.
+-            SHLIB_LD="$CC -shared -export-dynamic"
+-            SHLIB_CXX_LD="$CXX -shared -export-dynamic"
++            SHLIB_LD="$CC -shared -Wl,-export-dynamic"
++            SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"
+             DO_SECOND_LD=""
+             SO="sl"
+ 	    SHLIB_CFLAGS="+z $CFLAGS"
+@@ -8378,8 +8378,8 @@ fi
+ 	  LDFLAGS="-Wl,--export-dynamic $LDFLAGS"
+ 	  SHLIB_CFLAGS="-fPIC $CFLAGS"
+ 	  SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"
+-	  SHLIB_LD="$CC -shared -export-dynamic"
+-          SHLIB_CXX_LD="$CXX -shared -export-dynamic"
++	  SHLIB_LD="$CC -shared -Wl,-export-dynamic"
++          SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"
+           DO_SECOND_LD=""
+ 	  SO="so"
+ 	  INSTALL_DLLS=""
diff --git a/lang/yap/patches/patch-configure.in b/lang/yap/patches/patch-configure.in
new file mode 100644
index 00000000000..2017a630b74
--- /dev/null
+++ b/lang/yap/patches/patch-configure.in
@@ -0,0 +1,37 @@
+$NetBSD: patch-configure.in,v 1.1 2013/06/13 21:44:06 joerg Exp $
+
+--- configure.in.orig	2013-06-13 17:40:11.000000000 +0000
++++ configure.in
+@@ -1193,8 +1193,8 @@ case "$target_os" in

+           if test "$have_dl" = "yes"

+ 	  then

+ 	    SO="so"

+-            SHLIB_LD="$CC -shared -export-dynamic"

+-            SHLIB_CXX_LD="$CXX -shared -export-dynamic"

++            SHLIB_LD="$CC -shared -Wl,-export-dynamic"

++            SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"

+             DO_SECOND_LD=""

+ 	    LIBS="$LIBS -ldl"

+ 	    case "$target_cpu" in

+@@ -1263,8 +1263,8 @@ case "$target_os" in

+ 	  then

+ 	    #this tells ld to export all non-static symbols,

+ 	    #otherwise no external predicates.

+-            SHLIB_LD="$CC -shared -export-dynamic"

+-            SHLIB_CXX_LD="$CXX -shared -export-dynamic"

++            SHLIB_LD="$CC -shared -Wl,-export-dynamic"

++            SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"

+             DO_SECOND_LD=""

+             SO="sl"

+ 	    SHLIB_CFLAGS="+z $CFLAGS"

+@@ -1391,8 +1391,8 @@ dnl Linux has both elf and a.out, in thi
+ 	  LDFLAGS="-Wl,--export-dynamic $LDFLAGS"

+ 	  SHLIB_CFLAGS="-fPIC $CFLAGS"

+ 	  SHLIB_CXXFLAGS="-fPIC $CXXFLAGS"

+-	  SHLIB_LD="$CC -shared -export-dynamic"

+-          SHLIB_CXX_LD="$CXX -shared -export-dynamic"

++	  SHLIB_LD="$CC -shared -Wl,-export-dynamic"

++          SHLIB_CXX_LD="$CXX -shared -Wl,-export-dynamic"

+           DO_SECOND_LD=""

+ 	  SO="so"

+ 	  INSTALL_DLLS=""

diff --git a/lang/yap/patches/patch-packages_pldoc_Makefile.in b/lang/yap/patches/patch-packages_pldoc_Makefile.in
new file mode 100644
index 00000000000..93f4fa0dfc1
--- /dev/null
+++ b/lang/yap/patches/patch-packages_pldoc_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-packages_pldoc_Makefile.in,v 1.1 2013/06/13 21:44:06 joerg Exp $
+
+--- packages/pldoc/Makefile.in.orig	2013-06-13 17:35:04.000000000 +0000
++++ packages/pldoc/Makefile.in
+@@ -37,7 +37,7 @@ html-install:	install-examples
+ install-examples::
+ 		mkdir -p $(DESTDIR)$(EXDIR)
+ 		(cd $(srcdir)/server && $(INSTALL_DATA) $(EXAMPLES) $(DESTDIR)$(EXDIR))
+-		(cd server && $(INSTALL_PROGRAM) $(EXAMPLEEXE) $(DESTDIR)$(EXDIR))
++		(cd server && $(INSTALL_SCRIPT) $(EXAMPLEEXE) $(DESTDIR)$(EXDIR))
+ 
+ uninstall::
+ 		(cd $(LIBDIR) && rm -f $(LIBPL))