rpms/wine/F-7 wine-rpath.patch,1.4,1.5
Andreas Bierfert (awjb)
fedora-extras-commits at redhat.com
Tue Jul 3 15:42:49 UTC 2007
- Previous message: rpms/qgis/F-7 man-install-share.patch, NONE, 1.1 qgis.desktop, NONE, 1.1 qgis.spec, NONE, 1.1 settings-include-workdir.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/kernel/devel kernel-2.6.spec,1.3254,1.3255
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: awjb
Update of /cvs/pkgs/rpms/wine/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26205
Modified Files:
wine-rpath.patch
Log Message:
- rpath patch from devel
wine-rpath.patch:
Index: wine-rpath.patch
===================================================================
RCS file: /cvs/pkgs/rpms/wine/F-7/wine-rpath.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wine-rpath.patch 3 Jun 2007 14:51:54 -0000 1.4
+++ wine-rpath.patch 3 Jul 2007 15:42:44 -0000 1.5
@@ -1,6 +1,6 @@
---- configure.orig 2007-05-23 10:59:34.000000000 +0200
-+++ configure 2007-05-23 11:02:05.000000000 +0200
-@@ -13596,14 +13596,14 @@
+--- configure.orig 2007-07-03 14:31:05.000000000 +0200
++++ configure 2007-07-03 14:37:20.000000000 +0200
+@@ -13606,14 +13606,14 @@
fi
@@ -19,25 +19,53 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -13653,7 +13653,7 @@
+@@ -13663,17 +13663,17 @@
{ echo "$as_me:$LINENO: result: $ac_res" >&5
echo "${ECHO_T}$ac_res" >&6; }
if test `eval echo '${'$as_ac_var'}'` = yes; then
-- LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
-+ LIBWINE_LDFLAGS=""
+- LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
++ LDRPATH_INSTALL=""
++ LDRPATH_LOCAL=""
else
- as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
- { echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
---- configure.ac.orig 2007-05-23 10:59:39.000000000 +0200
-+++ configure.ac 2007-05-23 11:02:39.000000000 +0200
-@@ -1031,11 +1031,6 @@
+- as_ac_var=`echo "ac_cv_cflags_-fPIC -Wl,-R,\$ORIGIN/../lib" | $as_tr_sh`
+-{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib" >&5
+-echo $ECHO_N "checking whether the compiler supports -fPIC -Wl,-R,\$ORIGIN/../lib... $ECHO_C" >&6; }
++ as_ac_var=`echo "ac_cv_cflags_-fPIC" | $as_tr_sh`
++{ echo "$as_me:$LINENO: checking whether the compiler supports -fPIC" >&5
++echo $ECHO_N "checking whether the compiler supports -fPIC $ECHO_C" >&6; }
+ if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_wine_try_cflags_saved=$CFLAGS
+-CFLAGS="$CFLAGS -fPIC -Wl,-R,\$ORIGIN/../lib"
++CFLAGS="$CFLAGS -fPIC"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -13723,8 +13723,8 @@
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+ echo "${ECHO_T}$ac_res" >&6; }
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+- LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+- LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"
++ LDRPATH_INSTALL=""
++ LDRPATH_LOCAL=""
+ fi
+
+ fi
+--- configure.ac.orig 2007-07-03 14:37:34.000000000 +0200
++++ configure.ac 2007-07-03 14:37:59.000000000 +0200
+@@ -1006,13 +1006,6 @@
WINE_TRY_CFLAGS([-fPIC -Wl,--export-dynamic],
[AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])])
- WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-- [LIBWINE_LDFLAGS="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"],
+- [LDRPATH_INSTALL="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+- LDRPATH_LOCAL="-Wl,--rpath,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"],
- [WINE_TRY_CFLAGS([-fPIC -Wl,-R,\$ORIGIN/../lib],
-- [LIBWINE_LDFLAGS="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])])
+- [LDRPATH_INSTALL="-Wl,-R,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+- LDRPATH_LOCAL="-Wl,-R,\\\$\$ORIGIN/\$(TOPOBJDIR)/libs/wine"])])
-
case $host_cpu in
*i[[3456789]]86* | x86_64)
- Previous message: rpms/qgis/F-7 man-install-share.patch, NONE, 1.1 qgis.desktop, NONE, 1.1 qgis.spec, NONE, 1.1 settings-include-workdir.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message: rpms/kernel/devel kernel-2.6.spec,1.3254,1.3255
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list