diff options
Diffstat (limited to 'main/libtirpc/soname-suffix.patch')
| -rw-r--r-- | main/libtirpc/soname-suffix.patch | 69 |
1 files changed, 38 insertions, 31 deletions
diff --git a/main/libtirpc/soname-suffix.patch b/main/libtirpc/soname-suffix.patch index 4941bab172d..4037ef0ae24 100644 --- a/main/libtirpc/soname-suffix.patch +++ b/main/libtirpc/soname-suffix.patch @@ -1,9 +1,23 @@ -Allow to append a suffix to the library name via configuration -variable SONAME_SUFFIX. +Allow appending a suffix with SONAME_SUFFIX= +diff --git a/Makefile.am b/Makefile.am +index 3f60637..252568b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -46,7 +46,7 @@ nobase_include_HEADERS += \ + endif + + pkgconfigdir=$(libdir)/pkgconfig +-pkgconfig_DATA = libtirpc.pc ++pkgconfig_DATA = libtirpc@SONAME_SUFFIX@.pc + + CLEANFILES = cscope.* *~ + DISTCLEANFILES = Makefile.in libtirpc*.tar.gz +diff --git a/configure.ac b/configure.ac +index 8065881..c1a2a97 100644 --- a/configure.ac +++ b/configure.ac -@@ -74,6 +74,8 @@ +@@ -74,6 +74,8 @@ AC_ARG_ENABLE(symvers, [],[enable_symvers=yes]) AM_CONDITIONAL(SYMVERS, test "x$enable_symvers" = xyes) @@ -12,7 +26,7 @@ variable SONAME_SUFFIX. AC_CANONICAL_BUILD # Check for which host we are on and setup a few things # specifically based on the host -@@ -98,6 +100,7 @@ +@@ -98,6 +100,7 @@ AC_CHECK_LIB([pthread], [pthread_create]) AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) @@ -21,17 +35,25 @@ variable SONAME_SUFFIX. +AC_OUTPUT ---- a/Makefile.am -+++ b/Makefile.am -@@ -46,7 +46,7 @@ - endif - - pkgconfigdir=$(libdir)/pkgconfig --pkgconfig_DATA = libtirpc.pc -+pkgconfig_DATA = libtirpc@SONAME_SUFFIX@.pc +diff --git a/libtirpc.pc.in b/libtirpc.pc.in +index d2c7878..090b3fa 100644 +--- a/libtirpc.pc.in ++++ b/libtirpc.pc.in +@@ -3,10 +3,10 @@ + libdir=@libdir@ + includedir=@includedir@ - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in libtirpc*.tar.gz +-Name: libtirpc ++Name: libtirpc@SONAME_SUFFIX@ + Description: Transport Independent RPC Library + Requires: + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ltirpc ++Libs: -L${libdir} -ltirpc@SONAME_SUFFIX@ + Libs.private: @PTHREAD_LIBS@ + Cflags: -I${includedir}/tirpc +diff --git a/src/Makefile.am b/src/Makefile.am +index b2d5436..7280403 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,12 +10,12 @@ @@ -41,9 +63,9 @@ variable SONAME_SUFFIX. -lib_LTLIBRARIES = libtirpc.la +lib_LTLIBRARIES = libtirpc@SONAME_SUFFIX@.la --libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined -lpthread +-libtirpc_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined @PTHREAD_LIBS@ -libtirpc_la_LDFLAGS += -version-info @LT_VERSION_INFO@ -+libtirpc@SONAME_SUFFIX@_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined -lpthread ++libtirpc@SONAME_SUFFIX@_la_LDFLAGS = @LDFLAG_NOUNDEFINED@ -no-undefined @PTHREAD_LIBS@ +libtirpc@SONAME_SUFFIX@_la_LDFLAGS += -version-info @LT_VERSION_INFO@ -libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ @@ -86,18 +108,3 @@ variable SONAME_SUFFIX. CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in ---- a/libtirpc.pc.in -+++ b/libtirpc.pc.in -@@ -3,10 +3,10 @@ - libdir=@libdir@ - includedir=@includedir@ - --Name: libtirpc -+Name: libtirpc@SONAME_SUFFIX@ - Description: Transport Independent RPC Library - Requires: - Version: @PACKAGE_VERSION@ --Libs: -L@libdir@ -ltirpc -+Libs: -L@libdir@ -ltirpc@SONAME_SUFFIX@ - Libs.private: -lpthread - Cflags: -I@includedir@/tirpc |