[csw-devel] SF.net SVN: gar:[4469] csw/mgar/pkg/subversion/trunk

valholla at users.sourceforge.net valholla at users.sourceforge.net
Sun Apr 26 05:22:15 CEST 2009


Revision: 4469
          http://gar.svn.sourceforge.net/gar/?rev=4469&view=rev
Author:   valholla
Date:     2009-04-26 03:22:15 +0000 (Sun, 26 Apr 2009)

Log Message:
-----------
compiling update to version 1.6.1

Modified Paths:
--------------
    csw/mgar/pkg/subversion/trunk/Makefile
    csw/mgar/pkg/subversion/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/subversion/trunk/files/Makefile_in.diff

Removed Paths:
-------------
    csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff
    csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff

Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile	2009-04-24 17:25:44 UTC (rev 4468)
+++ csw/mgar/pkg/subversion/trunk/Makefile	2009-04-26 03:22:15 UTC (rev 4469)
@@ -86,20 +86,22 @@
 SVNLIB = $(prefix)/lib/svn
 
 NOISALIST = 1
-LDFLAGS =
+LDFLAGS  = -R/opt/csw/lib -L/opt/csw/lib -R/opt/csw/apache2/lib 
+LDFLAGS += -L/opt/csw/apache2/lib -L$(SVNLIB) -lintl -liconv
+export LDFLAGS
+
 CONFIGURE_ARGS  = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
-CONFIGURE_ARGS += --with-gnu-ld=yes
+CONFIGURE_ARGS += --disable-mod-activation
+CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --enable-javahl
 CONFIGURE_ARGS += --with-apr=$(prefix)/apache2/bin/apr-config
 CONFIGURE_ARGS += --with-apr-util=$(prefix)/apache2/bin/apu-config
 CONFIGURE_ARGS += --with-apxs=$(prefix)/apache2/sbin/apxs
-CONFIGURE_ARGS += --disable-mod-activation
 CONFIGURE_ARGS += --with-jdk=$(JDK)
-CONFIGURE_ARGS += --enable-javahl
-CONFIGURE_ARGS += --with-neon=$(prefix)
-CONFIGURE_ARGS += --with-zlib=$(prefix)
+#CONFIGURE_ARGS += --with-neon=$(prefix)
 CONFIGURE_ARGS += --with-sasl=$(prefix)
 CONFIGURE_ARGS += --with-ssl=$(prefix)
-CONFIGURE_ARGS += --disable-static
+CONFIGURE_ARGS += --with-zlib=$(prefix)
 
 TEST_TARGET = check
 # Tests take *forever*
@@ -108,12 +110,10 @@
 test-skip:
 	@$(DONADA)
 
-# Add libintl when linking
-EXTRA_LINKER_FLAGS += -lintl -liconv 
-
 include gar/category.mk
 
-BINDING_LANGS   = java perl python ruby
+#BINDING_LANGS   = java perl python ruby
+BINDING_LANGS   = ruby perl python java
 BINDING_TARGETS = $(foreach LANG,$(BINDING_LANGS),svn-$(LANG))
 
 PI_DEPENDS  = $(BINDING_TARGETS)
@@ -124,11 +124,25 @@
 	$(DONADA)
 
 post-configure-modulated:
-	@(echo "~~~ Fixing Libtool ~~~")
+	@echo "~~~ Fixing Libtool ~~~"
 	@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
-	@(gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc)
-	@(gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc)
-	@(gpatch -d $(WORKSRC) -p0 -F2 < $(DOWNLOADDIR)/$(GARCH)-gcc.diff)
+	@gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc
+	@gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc
+	@perl -i -pe 's/-mt\|*//' $(WORKSRC)/*.gcc
+	@perl -i -pe 's|-xO3|-pipe -O2|' $(WORKSRC)/*.gcc
+	@perl -i -pe 's|/opt/studio/SOS11/SUNWspro/bin/cc|/opt/csw/gcc4/bin/gcc|' \
+		             $(WORKSRC)/*.gcc
+	@perl -i -pe 's|/opt/studio/SOS11/SUNWspro/bin/CC|/opt/csw/gcc4/bin/g++|' \
+		             $(WORKSRC)/*.gcc
+	@perl -i -pe 's|libtool|libtool.gcc|' $(WORKSRC)/Makefile.gcc
+	@perl -i -pe 's|KPIC|fPIC|' $(WORKSRC)/libtool.gcc
+	@perl -i -pe 's|postdeps=.*|postdeps=""|' $(WORKSRC)/libtool.gcc
+
+	@( if [ "`uname -p`" = "sparc" ]; then \
+    	perl -i -pe 's|-xarch=v8|-mcpu=v8|' $(WORKSRC)/*.gcc; \
+	else \
+	    perl -i -pe 's|-xarch=i386|-mcpu=i386|' $(WORKSRC)/*.gcc; \
+	fi )
 	$(DONADA)
 
 fix-install:
@@ -167,7 +181,7 @@
 svn-ruby:
 	@echo " ==> Building Ruby bindings"
 	@touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c
-	@$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb
+	$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) swig-rb
 	#@$(TEST_ENV) gmake -f Makefile.gcc -C $(WORKSRC) check-swig-rb
 	@$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-swig-rb
 	$(DONADA)

Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums	2009-04-24 17:25:44 UTC (rev 4468)
+++ csw/mgar/pkg/subversion/trunk/checksums	2009-04-26 03:22:15 UTC (rev 4469)
@@ -1,11 +1,11 @@
-3d1dabbbcacf262e3e0baa3de79220d7  download/subversion-1.5.6.tar.bz2
-395ec6d1bfe07efadc1c0aa8816673fa  download/CSWsvn.checkinstall
 1e19681e6d988d35cfc6d708883ab7aa  download/CSWap2svn.postinstall
 586b9c9924c1547d44451a84d2aca702  download/CSWap2svn.preremove
+395ec6d1bfe07efadc1c0aa8816673fa  download/CSWsvn.checkinstall
+41ec540885de7c34625768aa1fb9682b  download/fixme.sh
 f107831ad0c702ff32e51df6a207237b  download/httpd-svn.conf.CSW
-1b532d3055708a97771f5cd959983628  download/svn_access.conf.CSW
-41ec540885de7c34625768aa1fb9682b  download/fixme.sh
-91d4c5a963192f113602b1bd1917d0cb  download/sparc-gcc.diff
 6caa3c518b84c2b3f6a33b61d1b022e3  download/i386-gcc.diff
 f0aa58c145ae99f8e4d72499ab826169  download/javahl_headers_for_nested_classes.diff
+91d4c5a963192f113602b1bd1917d0cb  download/sparc-gcc.diff
+95708b96b920faeffca017f43ec96777  download/subversion-1.6.1.tar.bz2
 f7d05c59656dcf01fb844295c9912f78  download/subversion156.diff
+1b532d3055708a97771f5cd959983628  download/svn_access.conf.CSW

Added: csw/mgar/pkg/subversion/trunk/files/Makefile_in.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/Makefile_in.diff	                        (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/Makefile_in.diff	2009-04-26 03:22:15 UTC (rev 4469)
@@ -0,0 +1,43 @@
+--- subversion-1.6.1/Makefile.in.o	2009-04-19 14:13:16.639723533 -0500
++++ subversion-1.6.1/Makefile.in	2009-04-19 14:14:27.736377714 -0500
+@@ -38,8 +38,8 @@
+ SCHEMA_DIR = subversion/svn/schema
+ 
+ NEON_LIBS = @NEON_LIBS@
+-SVN_APR_LIBS = @SVN_APR_LIBS@
+-SVN_APRUTIL_LIBS = @SVN_APRUTIL_LIBS@
++SVN_APR_LIBS = -L/opt/csw/lib -L/opt/csw/apache2/lib -lintl -liconv @SVN_APR_LIBS@
++SVN_APRUTIL_LIBS = -L/opt/csw/lib -L/opt/csw/apache2/lib @SVN_APRUTIL_LIBS@
+ SVN_APR_MEMCACHE_LIBS = @SVN_APR_MEMCACHE_LIBS@
+ SVN_DB_LIBS = @SVN_DB_LIBS@
+ SVN_GNOME_KEYRING_LIBS = @SVN_GNOME_KEYRING_LIBS@
+@@ -49,7 +49,7 @@
+ SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@
+ SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
+ 
+-LIBS = @LIBS@
++LIBS = -L/opt/csw/lib -L/opt/csw/apache2/lib -lintl -liconv -lsocket -lz @LIBS@
+ 
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+@@ -76,15 +76,15 @@
+ swig_rb_libdir = @libdir@
+ 
+ ### these possibly need further discussion
+-swig_pydir = @libdir@/svn-python/libsvn
+-swig_pydir_extra = @libdir@/svn-python/svn
+-swig_pldir = @libdir@/svn-perl
++swig_pydir = @prefix@/lib/python/site-packages/libsvn
++swig_pydir_extra = @prefix@/lib/python/site-packages/svn
++#swig_pldir = @libdir@/svn-perl
+ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
+ contribdir = @bindir@/svn-contrib
+ toolsdir = @bindir@/svn-tools
+ 
+-javahl_javadir = @libdir@/svn-javahl
+-javahl_javahdir = @libdir@/svn-javahl/include
++javahl_javadir = @libdir@
++javahl_javahdir = @libdir@/include
+ javahl_libdir = @libdir@
+ javahl_test_rootdir=$(abs_builddir)/subversion/bindings/javahl/test-work
+ 

Deleted: csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff	2009-04-24 17:25:44 UTC (rev 4468)
+++ csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff	2009-04-26 03:22:15 UTC (rev 4469)
@@ -1,172 +0,0 @@
---- libtool.gcc.o	2009-03-11 21:48:23.343791369 -0500
-+++ libtool.gcc	2009-03-11 21:48:50.846784450 -0500
-@@ -82,13 +82,13 @@
- AR_FLAGS="cru"
- 
- # A C compiler.
--LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+LTCC="/opt/csw/gcc3/bin/gcc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS"
-+LTCFLAGS="-O2 -pipe -m32 -march=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS"
- 
- # A language-specific compiler.
--CC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+CC="/opt/csw/gcc3/bin/gcc"
- 
- # Is the compiler the GNU C compiler?
- with_gcc=
-@@ -143,7 +143,7 @@
- exeext=""
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -KPIC -DPIC"
-+pic_flag=" -fPIC -DPIC"
- pic_mode=default
- 
- # What is the maximum length of a command?
-@@ -1989,7 +1989,7 @@
- 	continue
- 	;;
- 
--     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+     -mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	compiler_flags="$compiler_flags $arg"
- 	compile_command="$compile_command $arg"
- 	finalize_command="$finalize_command $arg"
-@@ -2003,7 +2003,7 @@
- 
-       # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-       # -r[0-9][0-9]* specifies the processor on the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # -march=*, -xtarget=* enable 64-bit mode on the Sun compiler
-       # +DA*, +DD* enable 64-bit mode on the HP compiler
-       # -q* pass through compiler args for the IBM compiler
-       # -m* pass through architecture-specific compiler args for GCC
-@@ -2012,7 +2012,7 @@
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
--      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-march=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
-@@ -2484,7 +2484,7 @@
- 	lib=
- 	found=no
- 	case $deplib in
--	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
-@@ -7318,13 +7318,13 @@
- AR_FLAGS="cru"
- 
- # A C compiler.
--LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+LTCC="/opt/csw/gcc3/bin/gcc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS"
-+LTCFLAGS="-O2 -pipe -m32 -march=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS"
- 
- # A language-specific compiler.
--CC="/opt/studio/SOS11/SUNWspro/bin/CC"
-+CC="/opt/csw/gcc3/bin/g++"
- 
- # Is the compiler the GNU C compiler?
- with_gcc=no
-@@ -7379,7 +7379,7 @@
- exeext=""
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -KPIC -DPIC"
-+pic_flag=" -fPIC -DPIC"
- pic_mode=default
- 
- # What is the maximum length of a command?
-@@ -7475,7 +7475,7 @@
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdeps="-library=Cstd -library=Crun"
-+postdeps=""
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -7624,10 +7624,10 @@
- AR_FLAGS="cru"
- 
- # A C compiler.
--LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+LTCC="/opt/csw/gcc3/bin/gcc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS"
-+LTCFLAGS="-O2 -pipe -m32 -march=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS"
- 
- # A language-specific compiler.
- CC="f77"
-@@ -7685,7 +7685,7 @@
- exeext=""
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -KPIC"
-+pic_flag=" -fPIC"
- pic_mode=default
- 
- # What is the maximum length of a command?
---- Makefile.gcc.o	2009-03-11 21:48:17.524971502 -0500
-+++ Makefile.gcc	2009-03-11 21:49:06.704433498 -0500
-@@ -89,12 +89,12 @@
- PACKAGE_NAME=subversion
- PACKAGE_VERSION=1.5.6
- 
--CC = /opt/studio/SOS11/SUNWspro/bin/cc
--CXX = /opt/studio/SOS11/SUNWspro/bin/CC
-+CC = /opt/csw/gcc3/bin/gc
-+CXX = /opt/csw/gcc3/bin/g++
- EXEEXT = 
- 
- SHELL = /bin/bash
--LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-i386/subversion-1.5.6/libtool
-+LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-i386/subversion-1.5.6/libtool.gcc
- LTFLAGS = --tag=CC --silent
- LTCXXFLAGS = --tag=CXX --silent
- LT_LDFLAGS = 
-@@ -113,10 +113,10 @@
- 
- SWIG = none
- SWIG_PY_INCLUDES = $(SWIG_INCLUDES) -I/opt/csw/include/python2.6 -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
--SWIG_PY_COMPILE = /opt/studio/SOS11/SUNWspro/bin/cc -DNDEBUG -O -Kpic
--SWIG_PY_LINK = /opt/studio/SOS11/SUNWspro/bin/cc -G
-+SWIG_PY_COMPILE = /opt/csw/gcc3/bin/gc -DNDEBUG -O -fpic
-+SWIG_PY_LINK = /opt/csw/gcc3/bin/gc -G
- SWIG_PY_LIBS = 
--SWIG_PL_INCLUDES = $(SWIG_INCLUDES)  -D_REENTRANT -xO3 -xtarget=generic -xarch=generic -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I/opt/csw/lib/perl/5.8.8/CORE 
-+SWIG_PL_INCLUDES = $(SWIG_INCLUDES)  -D_REENTRANT -O2 -pipe -m32 -xtarget=generic -march=generic -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I/opt/csw/lib/perl/5.8.8/CORE 
- SWIG_RB_INCLUDES = $(SWIG_INCLUDES) -I. -I/opt/csw/lib/ruby/1.8/i386-solaris2.8 -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
- SWIG_RB_COMPILE = /opt/csw/gcc4/bin/gcc -mtune=i686 -O2 -pipe -m32 -march=i386 -I/opt/csw/include  -fPIC  
- SWIG_RB_LINK = /opt/csw/gcc4/bin/gcc -shared -shrext .so
-@@ -142,14 +142,14 @@
- MKDIR = /opt/csw/bin/ginstall -c -d
- 
- # The EXTRA_ parameters can be used to pass extra flags at 'make' time.
--CFLAGS = -xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS)
--CXXFLAGS = -xO3 -xarch=386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS)
-+CFLAGS = -O2 -pipe -m32 -march=i386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS)
-+CXXFLAGS = -O2 -pipe -m32 -march=i386 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS)
- ### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes,
- ### -Wmissing-declarations) are not valid for C++, and should be somehow
- ### suppressed (but they may come from httpd or APR).
- CPPFLAGS = -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -I/opt/csw/bdb44/include -I/opt/csw/include -DSOLARIS2=8 -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_LARGEFILE64_SOURCE $(EXTRA_CPPFLAGS)
--LDFLAGS = -xarch=386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv    -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS)
--SWIG_LDFLAGS = -xarch=386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS)
-+LDFLAGS = -march=i386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv    -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS)
-+SWIG_LDFLAGS = -march=i386 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS)
- 
- COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
- COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)

Deleted: csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff	2009-04-24 17:25:44 UTC (rev 4468)
+++ csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff	2009-04-26 03:22:15 UTC (rev 4469)
@@ -1,172 +0,0 @@
---- libtool.gcc.o	2009-03-11 21:45:55.799166272 -0500
-+++ libtool.gcc	2009-03-11 21:46:43.392646721 -0500
-@@ -82,13 +82,13 @@
- AR_FLAGS="cru"
- 
- # A C compiler.
--LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+LTCC="/opt/csw/gcc3/bin/gcc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS"
-+LTCFLAGS="-O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS"
- 
- # A language-specific compiler.
--CC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+CC="/opt/csw/gcc3/bin/gcc"
- 
- # Is the compiler the GNU C compiler?
- with_gcc=
-@@ -143,7 +143,7 @@
- exeext=""
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -KPIC -DPIC"
-+pic_flag=" -fPIC -DPIC"
- pic_mode=default
- 
- # What is the maximum length of a command?
-@@ -1989,7 +1989,7 @@
- 	continue
- 	;;
- 
--     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+     -mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	compiler_flags="$compiler_flags $arg"
- 	compile_command="$compile_command $arg"
- 	finalize_command="$finalize_command $arg"
-@@ -2003,7 +2003,7 @@
- 
-       # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-       # -r[0-9][0-9]* specifies the processor on the SGI compiler
--      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-+      # -mcpu=*, -xtarget=* enable 64-bit mode on the Sun compiler
-       # +DA*, +DD* enable 64-bit mode on the HP compiler
-       # -q* pass through compiler args for the IBM compiler
-       # -m* pass through architecture-specific compiler args for GCC
-@@ -2012,7 +2012,7 @@
-       # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-       # -F/path gives path to uninstalled frameworks, gcc on darwin
-       # @file GCC response files
--      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-mcpu=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
- 
- 	# Unknown arguments in both finalize_command and compile_command need
-@@ -2484,7 +2484,7 @@
- 	lib=
- 	found=no
- 	case $deplib in
--	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-+	-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
- 	    finalize_deplibs="$deplib $finalize_deplibs"
-@@ -7318,13 +7318,13 @@
- AR_FLAGS="cru"
- 
- # A C compiler.
--LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+LTCC="/opt/csw/gcc3/bin/gcc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS"
-+LTCFLAGS="-O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS"
- 
- # A language-specific compiler.
--CC="/opt/studio/SOS11/SUNWspro/bin/CC"
-+CC="/opt/csw/gcc3/bin/gcc"
- 
- # Is the compiler the GNU C compiler?
- with_gcc=no
-@@ -7379,7 +7379,7 @@
- exeext=""
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -KPIC -DPIC"
-+pic_flag=" -fPIC -DPIC"
- pic_mode=default
- 
- # What is the maximum length of a command?
-@@ -7475,7 +7475,7 @@
- 
- # Dependencies to place after the objects being linked to create a
- # shared library.
--postdeps="-library=Cstd -library=Crun"
-+postdeps=""
- 
- # The library search path used internally by the compiler when linking
- # a shared library.
-@@ -7624,10 +7624,10 @@
- AR_FLAGS="cru"
- 
- # A C compiler.
--LTCC="/opt/studio/SOS11/SUNWspro/bin/cc"
-+LTCC="/opt/csw/gcc3/bin/gcc"
- 
- # LTCC compiler flags.
--LTCFLAGS="-xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS"
-+LTCFLAGS="-O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS"
- 
- # A language-specific compiler.
- CC="f77"
-@@ -7685,7 +7685,7 @@
- exeext=""
- 
- # Additional compiler flags for building library objects.
--pic_flag=" -KPIC"
-+pic_flag=" -fPIC"
- pic_mode=default
- 
- # What is the maximum length of a command?
---- Makefile.gcc.o	2009-03-11 21:45:44.001600884 -0500
-+++ Makefile.gcc	2009-03-11 21:46:14.602732752 -0500
-@@ -89,12 +89,12 @@
- PACKAGE_NAME=subversion
- PACKAGE_VERSION=1.5.6
- 
--CC = /opt/studio/SOS11/SUNWspro/bin/cc
--CXX = /opt/studio/SOS11/SUNWspro/bin/CC
-+CC = /opt/csw/gcc3/bin/gcc
-+CXX = /opt/csw/gcc3/bin/g++
- EXEEXT = 
- 
- SHELL = /bin/bash
--LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-sparcv8/subversion-1.5.6/libtool
-+LIBTOOL = $(SHELL) /home/mwatters/mgar/pkg/subversion/trunk/work/build-isa-sparcv8/subversion-1.5.6/libtool.gcc
- LTFLAGS = --tag=CC --silent
- LTCXXFLAGS = --tag=CXX --silent
- LT_LDFLAGS = 
-@@ -113,10 +113,10 @@
- 
- SWIG = none
- SWIG_PY_INCLUDES = $(SWIG_INCLUDES) -I/opt/csw/include/python2.6 -I$(SWIG_SRC_DIR)/python/libsvn_swig_py
--SWIG_PY_COMPILE = /opt/studio/SOS11/SUNWspro/bin/cc -DNDEBUG -O -xO3 -xarch=v8
--SWIG_PY_LINK = /opt/studio/SOS11/SUNWspro/bin/cc -G
-+SWIG_PY_COMPILE = /opt/csw/gcc3/bin/gcc -DNDEBUG -O -O2 -pipe -mcpu=v8
-+SWIG_PY_LINK = /opt/csw/gcc3/bin/gcc -G
- SWIG_PY_LIBS = 
--SWIG_PL_INCLUDES = $(SWIG_INCLUDES)  -D_REENTRANT -xO3 -xtarget=ultra -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I/opt/csw/lib/perl/5.8.8/CORE 
-+SWIG_PL_INCLUDES = $(SWIG_INCLUDES)  -D_REENTRANT -O2 -pipe -xtarget=ultra -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64  -I/opt/csw/lib/perl/5.8.8/CORE 
- SWIG_RB_INCLUDES = $(SWIG_INCLUDES) -I. -I/opt/csw/lib/ruby/1.8/sparc-solaris2.8 -I$(SWIG_SRC_DIR)/ruby/libsvn_swig_ruby
- SWIG_RB_COMPILE = /opt/csw/gcc4/bin/gcc -O2 -pipe -mcpu=v8 -I/opt/csw/include  -fPIC  
- SWIG_RB_LINK = /opt/csw/gcc4/bin/gcc -shared -shrext .so
-@@ -142,14 +142,14 @@
- MKDIR = /opt/csw/bin/ginstall -c -d
- 
- # The EXTRA_ parameters can be used to pass extra flags at 'make' time.
--CFLAGS = -xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -mt  -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS)
--CXXFLAGS = -xO3 -xarch=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS)
-+CFLAGS = -O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -D_LARGEFILE64_SOURCE -DNE_LFS $(EXTRA_CFLAGS)
-+CXXFLAGS = -O2 -pipe -mcpu=v8 -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include $(EXTRA_CXXFLAGS)
- ### A few of the CFLAGS (e.g. -Wmissing-prototypes, -Wstrict-prototypes,
- ### -Wmissing-declarations) are not valid for C++, and should be somehow
- ### suppressed (but they may come from httpd or APR).
- CPPFLAGS = -I/opt/csw/bdb44/include -I/opt/csw/apache2/include -I/usr/jdk1.5.0_15/include -I/opt/csw/include  -I/opt/csw/bdb44/include -I/opt/csw/include -DSOLARIS2=8 -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT -D_LARGEFILE64_SOURCE $(EXTRA_CPPFLAGS)
--LDFLAGS = -xarch=v8 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv    -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS)
--SWIG_LDFLAGS = -xarch=v8 -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS)
-+LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv    -L/opt/csw/bdb44/lib -L/opt/csw/lib -L/opt/csw/lib -L/opt/csw/lib $(EXTRA_LDFLAGS)
-+SWIG_LDFLAGS = -L/opt/csw/lib -R/opt/csw/lib/\\\$$ISALIST -R/opt/csw/lib -L/opt/csw/bdb44/lib -R/opt/csw/bdb44/lib/\\\$$ISALIST -R/opt/csw/bdb44/lib -L/opt/csw/lib/svn -R/opt/csw/lib/svn/\\\$$ISALIST -R/opt/csw/lib/svn -L/opt/csw/apache2/lib -R/opt/csw/apache2/lib/\\\$$ISALIST -R/opt/csw/apache2/lib -lintl -liconv $(EXTRA_SWIG_LDFLAGS)
- 
- COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(INCLUDES)
- COMPILE_CXX = $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(INCLUDES)


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



More information about the devel mailing list