diff options
Diffstat (limited to 'testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch')
| -rw-r--r-- | testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch | 126 |
1 files changed, 0 insertions, 126 deletions
diff --git a/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch b/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch deleted file mode 100644 index 2525928db4..0000000000 --- a/testing/nspr/nspr-4.8-pkgconfig-gentoo-3.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/config.mk nspr-4.8/mozilla/nsprpub/config/config.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/config.mk 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-09-12 00:44:19.383381757 -0500 -@@ -162,3 +162,4 @@ - RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include - RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin - RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib -+RELEASE_PC_DIR = $(RELEASE_LIB_DIR)/pkgconfig -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in nspr-4.8/mozilla/nsprpub/config/Makefile.in ---- nspr-4.8-orig/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-09-12 00:44:19.384379661 -0500 -@@ -52,9 +52,10 @@ - - # autoconf.mk must be deleted last (from the top-level directory) - # because it is included by every makefile. --DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config -+DIST_GARBAGE = nsprincl.mk nsprincl.sh nspr-config nspr.pc - - RELEASE_BINS = nspr-config -+RELEASE_PC = nspr.pc - - include $(topsrcdir)/config/config.mk - -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in nspr-4.8/mozilla/nsprpub/config/nspr-config.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/nspr-config.in 2009-09-12 00:45:53.723359547 -0500 -@@ -92,13 +92,13 @@ - - # Set variables that may be dependent upon other variables - if test -z "$exec_prefix"; then -- exec_prefix=@exec_prefix@ -+ exec_prefix=`pkg-config --variable=exec_prefix nspr` - fi - if test -z "$includedir"; then -- includedir=@includedir@ -+ includedir=`pkg-config --variable=includedir nspr` - fi - if test -z "$libdir"; then -- libdir=@libdir@ -+ libdir=`pkg-config --variable=libdir nspr` - fi - - if test "$echo_prefix" = "yes"; then -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in nspr-4.8/mozilla/nsprpub/config/nspr.pc.in ---- nspr-4.8-orig/mozilla/nsprpub/config/nspr.pc.in 1969-12-31 18:00:00.000000000 -0600 -+++ nspr-4.8/mozilla/nsprpub/config/nspr.pc.in 2009-09-12 00:44:19.410432811 -0500 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: NSPR -+Description: The Netscape Portable Runtime -+Version: @MOD_MAJOR_VERSION@.@MOD_MINOR_VERSION@.@MOD_PATCH_VERSION@ -+Libs: -L${libdir} -lplds@MOD_MAJOR_VERSION@ -lplc@MOD_MAJOR_VERSION@ -lnspr@MOD_MAJOR_VERSION@ -lpthread -Wl,-R${libdir} -+Cflags: -I${includedir} -+ -diff -urN nspr-4.8-orig/mozilla/nsprpub/config/rules.mk nspr-4.8/mozilla/nsprpub/config/rules.mk ---- nspr-4.8-orig/mozilla/nsprpub/config/rules.mk 2009-09-12 00:43:47.677356194 -0500 -+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-09-12 00:44:19.435517111 -0500 -@@ -211,7 +211,7 @@ - rm -rf $(wildcard *.OBJ *.OBJD) dist $(ALL_TRASH) $(DIST_GARBAGE) - +$(LOOP_OVER_DIRS) - --install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) -+install:: $(RELEASE_BINS) $(RELEASE_HEADERS) $(RELEASE_LIBS) $(RELEASE_PC) - ifdef RELEASE_BINS - $(NSINSTALL) -t -m 0755 $(RELEASE_BINS) $(DESTDIR)$(bindir) - endif -@@ -221,6 +221,9 @@ - ifdef RELEASE_LIBS - $(NSINSTALL) -t -m 0755 $(RELEASE_LIBS) $(DESTDIR)$(libdir)/$(lib_subdir) - endif -+ifdef RELEASE_PC -+ $(NSINSTALL) -t -m 0644 $(RELEASE_PC) $(DESTDIR)$(libdir)/pkgconfig/ -+endif - +$(LOOP_OVER_DIRS) - - release:: export -@@ -272,6 +275,23 @@ - fi - cp $(RELEASE_HEADERS) $(RELEASE_HEADERS_DEST) - endif -+ifdef RELEASE_PC -+ @echo "Copying pkg-config files to release directory" -+ @if test -z "$(BUILD_NUMBER)"; then \ -+ echo "BUILD_NUMBER must be defined"; \ -+ false; \ -+ else \ -+ true; \ -+ fi -+ @if test ! -d $(RELEASE_PC_DEST); then \ -+ rm -rf $(RELEASE_PC_DEST); \ -+ $(NSINSTALL) -D $(RELEASE_PC_DEST);\ -+ else \ -+ true; \ -+ fi -+ cp $(RELEASE_PC) $(RELEASE_PC_DEST) -+endif -+ - +$(LOOP_OVER_DIRS) - - alltags: -diff -urN nspr-4.8-orig/mozilla/nsprpub/configure nspr-4.8/mozilla/nsprpub/configure ---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-09-12 00:43:47.600359058 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure 2009-09-12 00:44:19.444380569 -0500 -@@ -6037,6 +6037,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile -diff -urN nspr-4.8-orig/mozilla/nsprpub/configure.in nspr-4.8/mozilla/nsprpub/configure.in ---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-09-12 00:43:47.678357452 -0500 -+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-09-12 00:44:19.451396074 -0500 -@@ -2871,6 +2871,7 @@ - config/nsprincl.mk - config/nsprincl.sh - config/nspr-config -+config/nspr.pc - lib/Makefile - lib/ds/Makefile - lib/libc/Makefile |