From c68b9e5076094d60e8f767ffcd3bb9c224fc3fe9 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 18 May 2014 09:28:59 +0200 Subject: fix musl compile, patches from AlpineLinux --- package/libtirpc/patches/patch-Makefile_in | 11 +++++++ package/libtirpc/patches/patch-configure_ac | 21 +++++++++++++ package/libtirpc/patches/patch-src_Makefile_in | 14 ++++----- package/libtirpc/patches/patch-src_getrpcent_c | 41 ++++++++++++++++++++++++++ 4 files changed, 80 insertions(+), 7 deletions(-) create mode 100644 package/libtirpc/patches/patch-Makefile_in create mode 100644 package/libtirpc/patches/patch-configure_ac create mode 100644 package/libtirpc/patches/patch-src_getrpcent_c (limited to 'package/libtirpc') diff --git a/package/libtirpc/patches/patch-Makefile_in b/package/libtirpc/patches/patch-Makefile_in new file mode 100644 index 000000000..0fbc7b2a0 --- /dev/null +++ b/package/libtirpc/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +--- libtirpc-0.2.4.orig/Makefile.in 2014-05-18 08:04:24.702953856 +0200 ++++ libtirpc-0.2.4/Makefile.in 2014-05-17 22:53:56.735636862 +0200 +@@ -344,7 +344,7 @@ target_alias = @target_alias@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src man doc ++SUBDIRS = src + ACLOCAL_AMFLAGS = -I m4 + noinst_HEADERS = tirpc/reentrant.h \ + tirpc/getpeereid.h \ diff --git a/package/libtirpc/patches/patch-configure_ac b/package/libtirpc/patches/patch-configure_ac new file mode 100644 index 000000000..87f8bb75e --- /dev/null +++ b/package/libtirpc/patches/patch-configure_ac @@ -0,0 +1,21 @@ +--- libtirpc-0.2.4.orig/configure.ac 2013-12-09 21:59:51.000000000 +0100 ++++ libtirpc-0.2.4/configure.ac 2014-05-18 08:04:03.214884953 +0200 +@@ -25,14 +25,16 @@ if test "x$enable_ipv6" != xno; then + fi + + AC_PROG_CC +-m4_pattern_allow(AM_CONFIG_HEADERS(config.h)) ++AC_CONFIG_HEADERS([config.h]) + AC_PROG_LIBTOOL + AC_HEADER_DIRENT + AC_PREFIX_DEFAULT(/usr) + AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h]) + AC_CHECK_LIB([pthread], [pthread_create]) + AC_CHECK_LIB([nsl], [yp_get_default_domain]) +- ++AC_CHECK_FUNCS([getrpcbyname getrpcbynumber]) + + AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) + AC_OUTPUT(libtirpc.pc) ++ ++ diff --git a/package/libtirpc/patches/patch-src_Makefile_in b/package/libtirpc/patches/patch-src_Makefile_in index abcd77e88..620b2caac 100644 --- a/package/libtirpc/patches/patch-src_Makefile_in +++ b/package/libtirpc/patches/patch-src_Makefile_in @@ -1,6 +1,6 @@ ---- libtirpc-0.2.4.orig/src/Makefile.in 2014-05-10 21:05:39.825812663 +0200 -+++ libtirpc-0.2.4/src/Makefile.in 2014-05-10 20:41:09.916621417 +0200 -@@ -106,9 +106,9 @@ am__libtirpc_la_SOURCES_DIST = auth_none +--- libtirpc-0.2.4.orig/src/Makefile.in 2014-05-18 08:04:24.954954664 +0200 ++++ libtirpc-0.2.4/src/Makefile.in 2014-05-17 22:53:56.967637091 +0200 +@@ -134,9 +134,9 @@ am__libtirpc_la_SOURCES_DIST = auth_none rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ svc_dg.c svc_auth_unix.c svc_auth_none.c svc_generic.c \ svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ @@ -13,7 +13,7 @@ @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \ @GSS_TRUE@ libtirpc_la-authgss_prot.lo \ @GSS_TRUE@ libtirpc_la-svc_auth_gss.lo -@@ -133,8 +133,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut +@@ -161,8 +161,7 @@ am_libtirpc_la_OBJECTS = libtirpc_la-aut libtirpc_la-svc_auth_none.lo libtirpc_la-svc_generic.lo \ libtirpc_la-svc_raw.lo libtirpc_la-svc_run.lo \ libtirpc_la-svc_simple.lo libtirpc_la-svc_vc.lo \ @@ -23,7 +23,7 @@ libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \ libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \ libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \ -@@ -355,9 +354,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u +@@ -400,9 +399,8 @@ libtirpc_la_SOURCES = auth_none.c auth_u rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ svc_dg.c svc_auth_unix.c svc_auth_none.c svc_generic.c \ svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ @@ -35,7 +35,7 @@ @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) CLEANFILES = cscope.* *~ DISTCLEANFILES = Makefile.in -@@ -438,10 +436,8 @@ mostlyclean-compile: +@@ -485,10 +483,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c @@ -46,7 +46,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_unix.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authdes_prot.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-authgss_prot.Plo@am__quote@ -@@ -809,20 +805,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c +@@ -856,20 +852,6 @@ libtirpc_la-getpeereid.lo: getpeereid.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-getpeereid.lo `test -f 'getpeereid.c' || echo '$(srcdir)/'`getpeereid.c diff --git a/package/libtirpc/patches/patch-src_getrpcent_c b/package/libtirpc/patches/patch-src_getrpcent_c new file mode 100644 index 000000000..8e213ae54 --- /dev/null +++ b/package/libtirpc/patches/patch-src_getrpcent_c @@ -0,0 +1,41 @@ +--- libtirpc-0.2.4.orig/src/getrpcent.c 2013-12-09 21:59:51.000000000 +0100 ++++ libtirpc-0.2.4/src/getrpcent.c 2014-05-18 08:04:03.462885748 +0200 +@@ -50,6 +50,10 @@ + #include + #endif + ++#if HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + /* + * Internet version. + */ +@@ -89,7 +93,7 @@ _rpcdata() + return (d); + } + +-#ifdef GQ ++#if !HAVE_GETRPCBYNYMBER + struct rpcent * + getrpcbynumber(number) + int number; +@@ -135,7 +139,9 @@ no_yp: + endrpcent(); + return (p); + } ++#endif /* !HAVE_GETRPCBYNUMBER */ + ++#if !HAVE_GETRPCBYNAME + struct rpcent * + getrpcbyname(name) + const char *name; +@@ -158,7 +164,7 @@ done: + endrpcent(); + return (rpc); + } +-#endif /* GQ */ ++#endif /* !HAVE_GETRPCBYNAME */ + + void + setrpcent(f) -- cgit v1.2.3