| 1 |
keri 10/10/30 08:34:24 |
| 2 |
|
| 3 |
Added: yap-6.2.0-lib-soname.patch |
| 4 |
Log: |
| 5 |
Ensure libYap.so is generated with a defined SONAME |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-lang/yap/files/yap-6.2.0-lib-soname.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.2.0-lib-soname.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/yap/files/yap-6.2.0-lib-soname.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: yap-6.2.0-lib-soname.patch |
| 15 |
=================================================================== |
| 16 |
diff -ur yap-6.orig/Makefile.in yap-6/Makefile.in |
| 17 |
--- yap-6.orig/Makefile.in 2010-10-18 21:48:20.000000000 +1300 |
| 18 |
+++ yap-6/Makefile.in 2010-10-30 21:27:55.000000000 +1300 |
| 19 |
@@ -96,6 +96,7 @@ |
| 20 |
TEXI2HTML=texi2html |
| 21 |
TEXI2PDF=texi2pdf |
| 22 |
YAPLIB=@YAPLIB@ |
| 23 |
+SONAMEFLAG=@SONAMEFLAG@ |
| 24 |
|
| 25 |
#4.1VPATH=@srcdir@:@srcdir@/OPTYap |
| 26 |
CWD=$(PWD) |
| 27 |
@@ -531,7 +532,7 @@ |
| 28 |
$(RANLIB) libYap.a |
| 29 |
|
| 30 |
@DYNYAPLIB@: $(LIB_OBJECTS) |
| 31 |
- @YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) |
| 32 |
+ @YAPLIB_LD@ -o @YAPLIB@ $(LIB_OBJECTS) $(LIBS) $(LDFLAGS) $(SONAMEFLAG) |
| 33 |
|
| 34 |
install: install_bin install_data |
| 35 |
|
| 36 |
diff -ur yap-6.orig/configure.in yap-6/configure.in |
| 37 |
--- yap-6.orig/configure.in 2010-10-30 21:28:41.000000000 +1300 |
| 38 |
+++ yap-6/configure.in 2010-10-30 21:27:06.000000000 +1300 |
| 39 |
@@ -915,6 +915,7 @@ |
| 40 |
fi |
| 41 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 42 |
DYNYAPLIB=libYap."$SO" |
| 43 |
+ SONAMEFLAG="-Wl,-soname=$DYNYAPLIB" |
| 44 |
fi |
| 45 |
if test "$have_nsl" = yes |
| 46 |
then |
| 47 |
@@ -944,6 +945,7 @@ |
| 48 |
INSTALL_DLLS="" |
| 49 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 50 |
DYNYAPLIB=libYap."$SO" |
| 51 |
+ SONAMEFLAG="" |
| 52 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" |
| 53 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 54 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 55 |
@@ -983,6 +985,7 @@ |
| 56 |
fi |
| 57 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 58 |
DYNYAPLIB=libYap."$SO" |
| 59 |
+ SONAMEFLAG="" |
| 60 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" |
| 61 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 62 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 63 |
@@ -996,6 +999,7 @@ |
| 64 |
#INSTALL_DLLS="" |
| 65 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 66 |
DYNYAPLIB=libYap."$SO" |
| 67 |
+ SONAMEFLAG="" |
| 68 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,\$(LIBDIR)" |
| 69 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 70 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 71 |
@@ -1014,6 +1018,7 @@ |
| 72 |
fi |
| 73 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 74 |
DYNYAPLIB=libYap."$SO" |
| 75 |
+ SONAMEFLAG="" |
| 76 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" |
| 77 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 78 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 79 |
@@ -1028,6 +1033,7 @@ |
| 80 |
INSTALL_DLLS="" |
| 81 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 82 |
DYNYAPLIB=libYap."$SO" |
| 83 |
+ SONAMEFLAG="" |
| 84 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" |
| 85 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 86 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 87 |
@@ -1066,6 +1072,7 @@ |
| 88 |
fi |
| 89 |
CC="$CC -fstrict-aliasing -freorder-blocks -fsched-interblock -Wall -Wstrict-aliasing=2" |
| 90 |
DYNYAPLIB=libYap."$SO" |
| 91 |
+ SONAMEFLAG="" |
| 92 |
YAPLIB_LD="$CC -dynamiclib -Wl,-install_name,$prefix/lib/libYap.dylib" |
| 93 |
PRE_INSTALL_ENV="DYLD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 94 |
;; |
| 95 |
@@ -1089,6 +1096,7 @@ |
| 96 |
fi |
| 97 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR)" |
| 98 |
DYNYAPLIB=libYap."$SO" |
| 99 |
+ SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" |
| 100 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -Wl,-R,\$(YAPLIBDIR)" |
| 101 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 102 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 103 |
@@ -1105,6 +1113,7 @@ |
| 104 |
INSTALL_DLLS="" |
| 105 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 106 |
DYNYAPLIB=libYap."$SO" |
| 107 |
+ SONAMEFLAG="-Wl,--soname=$DYNYAPLIB" |
| 108 |
if test "$dynamic_loading" = "yes" |
| 109 |
then |
| 110 |
YAPLIB_LD="\$(CC)" |
| 111 |
@@ -1123,6 +1132,7 @@ |
| 112 |
# and -fomit-frame-point -DBP_FREE |
| 113 |
YAPLIB="yap.dll" |
| 114 |
DYNYAPLIB="yap.dll" |
| 115 |
+ SONAMEFLAG="" |
| 116 |
SHLIB_CFLAGS="$CFLAGS" |
| 117 |
SHLIB_CXXFLAGS="$CXXFLAGS" |
| 118 |
if test "$target_win64" = no |
| 119 |
@@ -1163,6 +1173,7 @@ |
| 120 |
fi |
| 121 |
LDFLAGS="$LDFLAGS -L\$(abs_top_builddir) -Wl,-R,\$(LIBDIR) -Wl,-R,\$(YAPLIBDIR)" |
| 122 |
DYNYAPLIB=libYap."$SO" |
| 123 |
+ SONAMEFLAG="" |
| 124 |
EXTRA_LIBS_FOR_DLLS="$EXTRA_LIBS_FOR_DLLS -L\$(abs_top_builddir) -lYap -Wl,-R,\$(YAPLIBDIR) -Wl,-R,\$(LIBDIR)" |
| 125 |
PRE_INSTALL_ENV="LD_LIBRARY_PATH=\$(abs_top_builddir)" |
| 126 |
INSTALL_ENV="LD_LIBRARY_PATH=\$(DESTDIR)\$(LIBDIR):\$(DESTDIR)\$(YAPLIBDIR): YAPSHAREDIR=\$(DESTDIR)\$(SHAREDIR) YAPLIBDIR=\$(DESTDIR)\$(YAPLIBDIR)" |
| 127 |
@@ -1469,6 +1480,7 @@ |
| 128 |
AC_SUBST(YAPLIB) |
| 129 |
AC_SUBST(DYNYAPLIB) |
| 130 |
AC_SUBST(LDFLAGS) |
| 131 |
+AC_SUBST(SONAMEFLAG) |
| 132 |
dnl install_info |
| 133 |
AC_SUBST(INSTALL_INFO) |
| 134 |
dnl let YAP_EXTRAS fall through configure, from the env into Makefile |
Archives