[csw-devel] SF.net SVN: gar:[7352] csw/mgar/pkg/nspr/trunk/Makefile

[wahwah at users.sourceforge.net]

Revision: 7352
          http://gar.svn.sourceforge.net/gar/?rev=7352&view=rev
Author:   wahwah
Date:     2009-11-19 08:51:00 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
nspr: enable 64-bit compilation

Modified Paths:
--------------
    csw/mgar/pkg/nspr/trunk/Makefile

Modified: csw/mgar/pkg/nspr/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nspr/trunk/Makefile	2009-11-19 08:07:34 UTC (rev 7351)
+++ csw/mgar/pkg/nspr/trunk/Makefile	2009-11-19 08:51:00 UTC (rev 7352)
@@ -2,33 +2,38 @@
 MIN_VERSION = 8
 GARVERSION = 4.$(MIN_VERSION)
 CATEGORIES = lib
-# DISTNAME = $(GARNAME)
 
-DESCRIPTION = NSPR Netscape Portable Runtime
 define BLURB
-  NSPR Netscape Portable Runtime
+  Netscape Portable Runtime (NSPR) provides a platform-neutral API for system
+  level and libc like functions. The API is used in the Mozilla clients and
+  many of Red Hat's, Sun's, and other software offerings.
 endef
 
 MASTER_SITES = http://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(GARVERSION)/src/
 DISTFILES  = $(GARNAME)-$(GARVERSION).tar.gz
 PATCHFILES  = nspr-4.6.1-config.patch
 
-# We define upstream file regex so we can be notifed of new upstream software release
+PACKAGES = CSWnspr CSWnspr-devel
+PKGFILES_CSWnspr-devel = $(PKGFILES_DEVEL)
+PKGFILES_CSWnspr-devel += $(bindir).*nspr-config
+PKGFILES_CSWnspr-devel += $(prefix)/pkgconfig/nspr\.pc
+
+SPKG_DESC_CSWnspr = Netscape Portable Runtime
+SPKG_DESC_CSWnspr-devel = Netscape Portable Runtime development files
+CATALOGNAME_CSWnspr-devel = nspr_devel
+
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
 
 PERL = /opt/csw/bin/perl
 EXTRA_CFLAGS = -xlibmil
 EXTRA_CXXFLAGS = -xlibmil -xlibmopt -features=tmplife -norunpath
-EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -L/opt/csw/lib -R/opt/csw/lib
 CONFIGURE_SCRIPTS = nspr
 BUILD_SCRIPTS = nspr
 TEST_SCRIPTS =
 INSTALL_SCRIPTS = nspr
 
-# export PERL CFLAGS CXXFLAGS LDFLAGS
 export PERL
 
-# prefix = /opt/csw/mozilla/nspr
 libdir = $(prefix)/lib/nspr
 localstatedir = /var/opt/csw
 sysconfdir = /etc/opt/csw
@@ -39,27 +44,33 @@
 CONFIGURE_ARGS += --enable-strip
 CONFIGURE_ARGS += --with-native-threads
 CONFIGURE_ARGS += --enable-ipv6
-# CONFIGURE_ARGS += --enable-64bit
-# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr
-# CONFIGURE_ARGS += --enable-optimize="-xO3"
+CONFIGURE_ARGS += --enable-optimize="-xO3"
 CONFIGURE_ARGS += --disable-tests
 CONFIGURE_ARGS += --enable-system-sqlite
+CONFIGURE_ARGS_isa-sparcv9 = --enable-64bit
+CONFIGURE_ARGS_isa-amd64 = --enable-64bit
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(MODULATION))
+
+# These options I'm unsure about, are they really needed?
+# EXTRA_LDFLAGS = -R'\$\$ORIGIN:\$\$ORIGIN/..' -R/opt/csw/lib
+# prefix = /opt/csw/mozilla/nspr
+# CONFIGURE_ARGS += --with-dist-prefix=$(DESTDIR)/opt/csw/mozilla/nspr
 # CONFIGURE_ARGS += --with-dist-bindir=$(DESTDIR)/opt/csw/mozilla/nspr/lib
 
-# PATCHFILES = autoconf.mk.in.diff
+BUILD64 = 1
 
 include gar/category.mk
 
 configure-nspr:
 	(cp $(FILEDIR)/LICENSE $(WORKSRC))
-	(cd $(WORKSRC) && mkdir build inst)
+	(cd $(WORKSRC) && mkdir -p build inst)
 	gsed -i -e 's/$$(mkshlib) $$(OBJS)/$$(MKSHLIB) $$(LDFLAGS) $$(OBJS)/g' \
 		        $(WORKSRC)/mozilla/nsprpub/config/rules.mk
-	cd $(WORKSRC)/build && ../mozilla/nsprpub/configure $(CONFIGURE_ARGS)
+	cd $(WORKSRC)/build && $(CONFIGURE_ENV) ../mozilla/nsprpub/configure $(CONFIGURE_ARGS)
 	@$(MAKECOOKIE)
 
 build-nspr:
-	cd $(WORKSRC)/build && $(BUILD_ENV) gmake
+	(cd $(WORKSRC)/build && $(BUILD_ENV) gmake CC=$(CC) CXX=$(CXX))
 	@$(MAKECOOKIE)
 
 install-nspr:
@@ -77,8 +88,5 @@
 		$(DESTDIR)$(prefix)/pkgconfig
 	rm $(DESTDIR)$(bindir)/prerr.properties
 	rm $(DESTDIR)$(bindir)/nspr.pc
+	rm $(DESTDIR)$(bindir)/compile-et.pl
 	@$(MAKECOOKIE)
-
-post-install:
-	# ( gfind $(DESTDIR)/opt/csw -exec bash -c "file {} | grep ELF | grep -e 'executable' -e 'dynamic lib' | grep 'not stripped' && strip {}"  \; )
-	@$(MAKECOOKIE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.