Author: dj
Date: 2009-08-28 14:46:45 -0600 (Fri, 28 Aug 2009)
New Revision: 2108
Added:
trunk/nspr/nspr-4.8-pkgconfig-2.patch
Removed:
trunk/nspr/nspr-4.8-pkgconfig-1.patch
Log:
Corrected nspr-4.8-pkgconfig patch
Deleted: trunk/nspr/nspr-4.8-pkgconfig-1.patch
===================================================================
--- trunk/nspr/nspr-4.8-pkgconfig-1.patch 2009-08-28 20:33:51 UTC (rev
2107)
+++ trunk/nspr/nspr-4.8-pkgconfig-1.patch 2009-08-28 20:46:45 UTC (rev
2108)
@@ -1,113 +0,0 @@
-Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
-Date: 2009-08-28
-Initial Package Version: 4.8
-Upstream Status: not applicable
-Origin: self
-Description: Adds pkg-config file for nspr.
-
-diff -Naur 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 2005-04-29
16:02:53.000000000 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-08-28 10:05:39.000000000
-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 -Naur 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-03-03
16:04:23.000000000 -0600
-+++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-08-28
10:04:36.000000000 -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 -Naur 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-08-28 10:04:36.000000000
-0500
-@@ -0,0 +1,11 @@
-+pref...@prefix@
-+exec_pref...@exec_prefix@
-+libd...@libdir@
-+included...@includedir@
-+
-+Name: NSPR
-+Description: The Netscape Portable Runtime
-+Version: @mod_major_vers...@.@mod_minor_vers...@.@MOD_PATCH_VERSION@
-+Libs: -L${libdir} -lplds4 -lplc4 -lnspr4 -lpthread
-+Cflags: -I${includedir}
-+
-diff -Naur 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-05-01
18:08:01.000000000 -0500
-+++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-08-28 10:06:22.000000000
-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 -Naur nspr-4.8-orig/mozilla/nsprpub/configure
nspr-4.8/mozilla/nsprpub/configure
---- nspr-4.8-orig/mozilla/nsprpub/configure 2009-05-08 08:12:31.000000000
-0500
-+++ nspr-4.8/mozilla/nsprpub/configure 2009-08-28 10:04:36.000000000 -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 -Naur nspr-4.8-orig/mozilla/nsprpub/configure.in
nspr-4.8/mozilla/nsprpub/configure.in
---- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-05-01 18:08:00.000000000
-0500
-+++ nspr-4.8/mozilla/nsprpub/configure.in 2009-08-28 10:04:36.000000000
-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
Added: trunk/nspr/nspr-4.8-pkgconfig-2.patch
===================================================================
--- trunk/nspr/nspr-4.8-pkgconfig-2.patch (rev 0)
+++ trunk/nspr/nspr-4.8-pkgconfig-2.patch 2009-08-28 20:46:45 UTC (rev
2108)
@@ -0,0 +1,113 @@
+Submitted By: DJ Lucas <dj at linuxfromscratch dot org>
+Date: 2009-08-28
+Initial Package Version: 4.8
+Upstream Status: not applicable
+Origin: self
+Description: Adds pkg-config file for nspr.
+
+diff -Naur 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 2005-04-29
16:02:53.000000000 -0500
++++ nspr-4.8/mozilla/nsprpub/config/config.mk 2009-08-28 15:42:46.000000000
-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 -Naur 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-03-03
16:04:23.000000000 -0600
++++ nspr-4.8/mozilla/nsprpub/config/Makefile.in 2009-08-28
15:42:46.000000000 -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 -Naur 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-08-28 15:43:13.000000000
-0500
+@@ -0,0 +1,11 @@
++pref...@prefix@
++exec_pref...@exec_prefix@
++libd...@libdir@
++included...@includedir@
++
++Name: NSPR
++Description: The Netscape Portable Runtime
++Version: @mod_major_vers...@.@mod_minor_vers...@.@MOD_PATCH_VERSION@
++Libs: -L${libdir} -lp...@mod_major_version@ -l...@mod_major_version@
-ln...@mod_major_version@ -lpthread
++Cflags: -I${includedir}
++
+diff -Naur 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-05-01
18:08:01.000000000 -0500
++++ nspr-4.8/mozilla/nsprpub/config/rules.mk 2009-08-28 15:42:46.000000000
-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 -Naur nspr-4.8-orig/mozilla/nsprpub/configure
nspr-4.8/mozilla/nsprpub/configure
+--- nspr-4.8-orig/mozilla/nsprpub/configure 2009-05-08 08:12:31.000000000
-0500
++++ nspr-4.8/mozilla/nsprpub/configure 2009-08-28 15:42:46.000000000 -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 -Naur nspr-4.8-orig/mozilla/nsprpub/configure.in
nspr-4.8/mozilla/nsprpub/configure.in
+--- nspr-4.8-orig/mozilla/nsprpub/configure.in 2009-05-01 18:08:00.000000000
-0500
++++ nspr-4.8/mozilla/nsprpub/configure.in 2009-08-28 15:42:46.000000000
-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
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
