pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Don't try to enable dtags in the wildcard case



Module Name:	pkgsrc-wip
Committed By:	coypu <coypu%sdf.org@localhost>
Pushed By:	coypu
Date:		Fri Sep 2 19:45:28 2016 +0300
Changeset:	b641e5096a29a34528e9437c63f6e7a0d859fa6f

Modified Files:
	wine-devel/distinfo
	wine-devel/patches/patch-configure.ac

Log Message:
Don't try to enable dtags in the wildcard case

(i.e. non-linux), netbsd passes the compile test,
but fails at runtime - ld.so (intentionally) doesn't
handle new dtags.

PR pkg/51324

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b641e5096a29a34528e9437c63f6e7a0d859fa6f

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 wine-devel/distinfo                   |  2 +-
 wine-devel/patches/patch-configure.ac | 15 ++++++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diffs:
diff --git a/wine-devel/distinfo b/wine-devel/distinfo
index f5a7a3e..55646fb 100644
--- a/wine-devel/distinfo
+++ b/wine-devel/distinfo
@@ -4,7 +4,7 @@ SHA1 (wine-1.9.12.tar.bz2) = 4b186865f8152aee69799786bd94d027900f0fb5
 RMD160 (wine-1.9.12.tar.bz2) = 2fadbac17353834a4886c9265f67c5cdaf44fbca
 SHA512 (wine-1.9.12.tar.bz2) = 056156260cd71c23f03deff35f97ce9ed0d1b3b153887e9af13ca97c27caebc87d5272fcc27566595feecd65ada3fdba96ea0f58afea566dbd34f7d240519d10
 Size (wine-1.9.12.tar.bz2) = 23240036 bytes
-SHA1 (patch-configure.ac) = bcd4f20ff4bdd990f9ca3047f46c777d5be380ae
+SHA1 (patch-configure.ac) = 304ab35b7a99c9da4782a5d527ce6c1a5813fc3e
 SHA1 (patch-dlls_wineoss.drv_mmdevdrv.c) = 89f9d1c08dbfbed3eac971ee534944f7403246a4
 SHA1 (patch-dlls_winepulse.drv_mmdevdrv.c) = c9aad42d1fbfcc309dcc6ddc3dd9aefb9a556075
 SHA1 (patch-dlls_wininet_http.c) = f186d88e93c00deb7b885fa97f903f4e444669bf
diff --git a/wine-devel/patches/patch-configure.ac b/wine-devel/patches/patch-configure.ac
index 7f95446..c44d2e1 100644
--- a/wine-devel/patches/patch-configure.ac
+++ b/wine-devel/patches/patch-configure.ac
@@ -2,9 +2,22 @@ $NetBSD$
 
 Add check for pthread_mutexattr_setprotocol.
 
+Don't try to enable dtags in the wildcard case (i.e. non-linux),
+netbsd passes the compile test, but fails at runtime (PR pkg/51324)
+
 --- configure.ac.orig	2016-06-10 14:04:01.000000000 +0000
 +++ configure.ac
-@@ -1452,6 +1452,8 @@ then
+@@ -891,9 +891,6 @@ case $host_os in
+                            [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(MAKEDEP) -R \${bindir} \${libdir}\`"
+                             LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(top_builddir)/libs/wine"])])
+ 
+-      WINE_TRY_CFLAGS([-Wl,--enable-new-dtags],
+-                      [LDRPATH_INSTALL="$LDRPATH_INSTALL -Wl,--enable-new-dtags"])
+-
+       case $host_cpu in
+         *i[[3456789]]86* | x86_64)
+           WINE_TRY_CFLAGS([-Wl,-Ttext-segment=0x7bc00000],
+@@ -1452,6 +1449,8 @@ then
          [AC_CHECK_HEADERS(pulse/pulseaudio.h,
              [AC_CHECK_LIB(pulse, pa_stream_is_corked,[:],[PULSE_LIBS=""],[$PULSE_LIBS])],
              [PULSE_LIBS=""])])


Home | Main Index | Thread Index | Old Index