From bf8903fa567e5c1b5d923c6f1c0aeb1d2fd1192a Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 15 Jun 2014 13:09:33 +0200 Subject: cleanup HOST_STYLE, use SYSROOT feature for pkgconf there are three HOST_STYLE's, not set mean fully automatic installation. auto means prefix is set to /usr and DESTDIR is set to STAGING_HOST_DIR. When using manual, you need to provide your own targets. Instead of using sed to modify *.pc files, use PKG_SYSROOT feature, which does work better and avoids pathcing some pc files. Idea from sh4rm via #musl. --- package/libtirpc/patches/patch-Makefile_in | 11 ---- package/libtirpc/patches/patch-src_Makefile_in | 69 -------------------------- 2 files changed, 80 deletions(-) delete mode 100644 package/libtirpc/patches/patch-Makefile_in delete mode 100644 package/libtirpc/patches/patch-src_Makefile_in (limited to 'package/libtirpc') diff --git a/package/libtirpc/patches/patch-Makefile_in b/package/libtirpc/patches/patch-Makefile_in deleted file mode 100644 index 0fbc7b2a0..000000000 --- a/package/libtirpc/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-src_Makefile_in b/package/libtirpc/patches/patch-src_Makefile_in deleted file mode 100644 index 620b2caac..000000000 --- a/package/libtirpc/patches/patch-src_Makefile_in +++ /dev/null @@ -1,69 +0,0 @@ ---- 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 \ -- auth_time.c auth_des.c authdes_prot.c xdr.c xdr_rec.c \ -- xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \ -- auth_gss.c authgss_prot.c svc_auth_gss.c -+ authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \ -+ xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \ -+ authgss_prot.c svc_auth_gss.c - @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 -@@ -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 \ -- libtirpc_la-getpeereid.lo libtirpc_la-auth_time.lo \ -- libtirpc_la-auth_des.lo libtirpc_la-authdes_prot.lo \ -+ libtirpc_la-getpeereid.lo libtirpc_la-authdes_prot.lo \ - 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 \ -@@ -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 \ -- auth_time.c auth_des.c authdes_prot.c xdr.c xdr_rec.c \ -- xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \ -- $(am__append_1) -+ authdes_prot.c xdr.c xdr_rec.c xdr_array.c xdr_float.c \ -+ xdr_mem.c xdr_reference.c xdr_stdio.c $(am__append_1) - @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in -@@ -485,10 +483,8 @@ mostlyclean-compile: - distclean-compile: - -rm -f *.tab.c - --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_des.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_gss.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_none.Plo@am__quote@ --@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtirpc_la-auth_time.Plo@am__quote@ - @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@ -@@ -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 - --libtirpc_la-auth_time.lo: auth_time.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_time.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_time.Tpo -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-auth_time.Tpo $(DEPDIR)/libtirpc_la-auth_time.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='auth_time.c' object='libtirpc_la-auth_time.lo' libtool=yes @AMDEPBACKSLASH@ --@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-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c -- --libtirpc_la-auth_des.lo: auth_des.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c --@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo --@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@ --@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-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c -- - libtirpc_la-authdes_prot.lo: authdes_prot.c - @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo -- cgit v1.2.3