[csw-devel] SF.net SVN: gar:[3722] csw/mgar/pkg/subversion/trunk
valholla at users.sourceforge.net
valholla at users.sourceforge.net
Thu Mar 12 05:17:21 CET 2009
Revision: 3722
http://gar.svn.sourceforge.net/gar/?rev=3722&view=rev
Author: valholla
Date: 2009-03-12 04:17:20 +0000 (Thu, 12 Mar 2009)
Log Message:
-----------
working copy
Modified Paths:
--------------
csw/mgar/pkg/subversion/trunk/Makefile
csw/mgar/pkg/subversion/trunk/checksums
csw/mgar/pkg/subversion/trunk/files/subversion156.diff
Added Paths:
-----------
csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff
csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff
Removed Paths:
-------------
csw/mgar/pkg/subversion/trunk/files/gccMake.sh
Modified: csw/mgar/pkg/subversion/trunk/Makefile
===================================================================
--- csw/mgar/pkg/subversion/trunk/Makefile 2009-03-12 01:58:37 UTC (rev 3721)
+++ csw/mgar/pkg/subversion/trunk/Makefile 2009-03-12 04:17:20 UTC (rev 3722)
@@ -29,7 +29,6 @@
PACKAGES = CSWsvn CSWsvn-devel CSWap2svn CSWpmsvn
PACKAGES += CSWpysvn CSWrbsvn CSWjavasvn
-PACKAGES += CSWpysvn CSWjavasvn
SPKG_DESC_CSWsvn = Version control rethought
CATALOGNAME_CSWsvn = subversion
@@ -44,7 +43,7 @@
REQUIRED_PKGS_CSWap2svn = CSWsvn
SPKG_DESC_CSWjavasvn = Subversion Java Language Binding
CATALOGNAME_CSWjavasvn = javasvn
-REQUIRED_PKGS_CSWjavasvn = CSWsvn
+REQUIRED_PKGS_CSWjavasvn = CSWsvn CSWgcc3g++rt CSWgcc3corert
SPKG_DESC_CSWpmsvn = Subversion Perl Language Binding
CATALOGNAME_CSWpmsvn = pmsvn
REQUIRED_PKGS_CSWpmsvn = CSWsvn CSWperl
@@ -53,24 +52,25 @@
REQUIRED_PKGS_CSWpysvn = CSWsvn CSWpython
SPKG_DESC_CSWrbsvn = Subversion Ruby Language Binding
CATALOGNAME_CSWrbsvn = rbsvn
-REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby
+REQUIRED_PKGS_CSWrbsvn = CSWsvn CSWruby CSWgcc3g++rt CSWgcc3corert
PKGFILES_CSWsvn-devel = $(PKGFILES_DEVEL)
-PKGFILES_CSWap2svn = $(prefix)/apache2*
-PKGFILES_CSWjavasvn = $(SVNLIB)/*java*
-PKGFILES_CSWpmsvn = $(libdir)/perl*
-PKGFILES_CSWpmsvn += $(SVNLIB)/*perl*
-PKGFILES_CSWpmsvn += $(mandir)/*swig_perl*
-PKGFILES_CSWpysvn = $(libdir)/python*
-PKGFILES_CSWpysvn += $(SVNLIB)/*swig_py*
-PKGFILES_CSWrbsvn = $(libdir)/ruby*
-PKGFILES_CSWrbsvn += $(SVNLIB)/*swig_ruby*
+PKGFILES_CSWap2svn = $(prefix)/apache2.*
+PKGFILES_CSWjavasvn = $(SVNLIB)/.*java.*
+PKGFILES_CSWpmsvn = $(libdir)/perl.*
+PKGFILES_CSWpmsvn += $(SVNLIB)/.*perl.*
+PKGFILES_CSWpmsvn += $(mandir)/.*swig_perl.*
+PKGFILES_CSWpysvn = $(libdir)/python.*
+PKGFILES_CSWpysvn += $(SVNLIB)/.*swig_py.*
+PKGFILES_CSWrbsvn = $(libdir)/ruby.*
+PKGFILES_CSWrbsvn += $(SVNLIB)/.*swig_ruby.*
DISTFILES += CSWsvn.checkinstall
DISTFILES += CSWap2svn.postinstall CSWap2svn.preremove
DISTFILES += httpd-svn.conf.CSW svn_access.conf.CSW
DISTFILES += fixme.sh
-DISTFILES += gccMake.sh
+DISTFILES += sparc-gcc.diff
+DISTFILES += i386-gcc.diff
# Fix: Add java headers for nested classes
# https://lists.ubuntu.com/archives/ubuntu-devel-discuss/2008-June/004633.html
@@ -83,11 +83,10 @@
NODIRPATHS = --libdir --libexecdir
JDK = /usr/jdk1.5.0_15
EXTRA_INC += $(JDK)/include
-
SVNLIB = $(prefix)/lib/svn
CONFIGURE_ARGS = $(DIRPATHS) --libdir=$(SVNLIB) --libexecdir=$(SVNLIB)
-CONFIGURE_ARGS += --with-gnu-ld=/opt/csw/bin/gld
+CONFIGURE_ARGS += --with-gnu-ld=yes
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
@@ -98,12 +97,15 @@
CONFIGURE_ARGS += --with-zlib=$(prefix)
CONFIGURE_ARGS += --with-sasl=$(prefix)
CONFIGURE_ARGS += --with-ssl=$(prefix)
+CONFIGURE_ARGS += --disable-static
TEST_TARGET = check
-
# Tests take *forever*
-TEST_SCRIPTS =
+TEST_SCRIPTS = skip
+test-skip:
+ @$(DONADA)
+
# Add libintl when linking
EXTRA_LINKER_FLAGS += -lintl -liconv
@@ -114,6 +116,7 @@
PI_DEPENDS = $(BINDING_TARGETS)
PI_DEPENDS += copy-templates
+PI_DEPENDS += fix-install
post-install-modulated: $(PI_DEPENDS)
$(DONADA)
@@ -121,9 +124,14 @@
post-configure-modulated:
@(echo "~~~ Fixing Libtool ~~~")
@$(DOWNLOADDIR)/fixme.sh $(WORKSRC)
- @$(DOWNLOADDIR)/gccMake.sh $(WORKSRC)
+ @(gcp $(WORKSRC)/Makefile $(WORKSRC)/Makefile.gcc)
+ @(gcp $(WORKSRC)/libtool $(WORKSRC)/libtool.gcc)
+ @(gpatch -d $(WORKSRC) -p0 -F2 < $(DOWNLOADDIR)/$(GARCH)-gcc.diff)
$(DONADA)
+fix-install:
+ @(grm -fr $(DESTDIR)$(prefix)/lib/perl/5.8)
+
copy-templates:
ginstall -d $(DESTDIR)$(prefix)/apache2/etc/extra
ginstall -m 0644 \
@@ -140,6 +148,7 @@
$(WORKSRC)/subversion/bindings/swig/python/*.c \
$(WORKSRC)/subversion/bindings/swig/python/*.py
@$(BUILD_ENV) gmake -C $(WORKSRC) swig-py
+ #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-py
@$(INSTALL_ENV) gmake -C $(WORKSRC) install-swig-py
$(DONADA)
@@ -149,6 +158,7 @@
$(WORKSRC)/subversion/bindings/swig/perl/native/*.c \
$(WORKSRC)/subversion/bindings/swig/perl/native/*.pm
@$(BUILD_ENV) gmake -C $(WORKSRC) swig-pl
+ #@$(TEST_ENV) gmake -C $(WORKSRC) check-swig-pl
@$(INSTALL_ENV) gmake DESTDIR=$(DESTDIR) -C $(WORKSRC) install-swig-pl
$(DONADA)
@@ -156,13 +166,16 @@
@echo " ==> Building Ruby bindings"
@touch $(WORKSRC)/subversion/bindings/swig/ruby/*.c
@$(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)
+## The test can only be run "after" you have it installed.
svn-java:
@echo " ==> Building Java bindings"
@touch $(WORKSRC)/subversion/bindings/javahl/native/*.c
@$(BUILD_ENV) gmake -f Makefile.gcc -C $(WORKSRC) javahl
+ #@$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) check-javahl
@$(INSTALL_ENV) gmake -f Makefile.gcc -C $(WORKSRC) install-javahl
$(DONADA)
Modified: csw/mgar/pkg/subversion/trunk/checksums
===================================================================
--- csw/mgar/pkg/subversion/trunk/checksums 2009-03-12 01:58:37 UTC (rev 3721)
+++ csw/mgar/pkg/subversion/trunk/checksums 2009-03-12 04:17:20 UTC (rev 3722)
@@ -5,6 +5,7 @@
f107831ad0c702ff32e51df6a207237b download/httpd-svn.conf.CSW
1b532d3055708a97771f5cd959983628 download/svn_access.conf.CSW
41ec540885de7c34625768aa1fb9682b download/fixme.sh
-a1983ac6084ab919be687906d0892c44 download/gccMake.sh
+91d4c5a963192f113602b1bd1917d0cb download/sparc-gcc.diff
+6caa3c518b84c2b3f6a33b61d1b022e3 download/i386-gcc.diff
f0aa58c145ae99f8e4d72499ab826169 download/javahl_headers_for_nested_classes.diff
-89b68eb851673a9a0ebe29cd0010f0ed download/subversion156.diff
+f7d05c59656dcf01fb844295c9912f78 download/subversion156.diff
Deleted: csw/mgar/pkg/subversion/trunk/files/gccMake.sh
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/gccMake.sh 2009-03-12 01:58:37 UTC (rev 3721)
+++ csw/mgar/pkg/subversion/trunk/files/gccMake.sh 2009-03-12 04:17:20 UTC (rev 3722)
@@ -1,24 +0,0 @@
-#!/opt/csw/bin/bash
-
-PATH=/opt/csw/bin
-WORKSRC=$1
-
-gcp $WORKSRC/Makefile $WORKSRC/Makefile.gcc
-gcp $WORKSRC/libtool $WORKSRC/libtool.gcc
-
-
-perl -i -pnle 's|^(LIBTOOL.*)/libtool$|$1/libtool.gcc|' \
- $WORKSRC/Makefile.gcc
-perl -i -pnle 's/-xO3\s*//' $WORKSRC/*.gcc
-perl -i -pnle 's/-xarch=v8\s*//' $WORKSRC/*.gcc
-perl -i -pnle 's/-mt\|*\s*//' $WORKSRC/*.gcc
-perl -i -pnle 's/-KPIC/-fPIC/' $WORKSRC/*.gcc
-perl -i -pnle 's/.*CC=.*cc"/LTCC=\/opt\/csw\/gcc4\/bin\/gcc/' \
- $WORKSRC/libtool.gcc
-perl -i -pnle 's/.*CC=.*CC"/LTCC=\/opt\/csw\/gcc4\/bin\/g\+\+/' \
- $WORKSRC/libtool.gcc
-perl -i -pnle 's/CC =.*$/CC = \/opt\/csw\/gcc4\/bin\/gcc/' \
- $WORKSRC/Makefile.gcc
-perl -i -pnle 's/CXX =.*$/CXX = \/opt\/csw\/gcc4\/bin\/g\+\+/' \
- $WORKSRC/Makefile.gcc
-
Added: csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/i386-gcc.diff 2009-03-12 04:17:20 UTC (rev 3722)
@@ -0,0 +1,172 @@
+--- 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)
Added: csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff (rev 0)
+++ csw/mgar/pkg/subversion/trunk/files/sparc-gcc.diff 2009-03-12 04:17:20 UTC (rev 3722)
@@ -0,0 +1,172 @@
+--- 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)
Modified: csw/mgar/pkg/subversion/trunk/files/subversion156.diff
===================================================================
--- csw/mgar/pkg/subversion/trunk/files/subversion156.diff 2009-03-12 01:58:37 UTC (rev 3721)
+++ csw/mgar/pkg/subversion/trunk/files/subversion156.diff 2009-03-12 04:17:20 UTC (rev 3722)
@@ -1,13 +1,5 @@
--- subversion-1.5.5/Makefile.in.orig 2008-08-26 12:27:56.000000000 -0500
+++ subversion-1.5.5/Makefile.in 2009-02-21 17:26:25.849467074 -0600
-@@ -46,6 +46,7 @@
- SVN_ZLIB_LIBS = @SVN_ZLIB_LIBS@
-
- LIBS = @LIBS@
-+JAVAHL_LIBS = @LIBS@ -lCrun -lCstd
-
- prefix = @prefix@
- exec_prefix = @exec_prefix@
@@ -68,15 +69,15 @@
swig_rb_libdir = @libdir@
@@ -39,15 +31,3 @@
+ cmd = ["gdiff"] \
+ self.diffoptions \
+ [self.tempfile1, self.tempfile2]
-
---- subversion-1.5.5/build-outputs.mk.orig 2009-02-21 20:49:58.653938743 -0600
-+++ subversion-1.5.5/build-outputs.mk 2009-02-21 20:51:14.193027135 -0600
-@@ -305,7 +305,7 @@
- libsvnjavahl_DEPS = $(javahl_javah_DEPS) $(javahl_java_DEPS) subversion/bindings/javahl/native/BlameCallback.lo subversion/bindings/javahl/native/ChangelistCallback.lo subversion/bindings/javahl/native/CommitMessage.lo subversion/bindings/javahl/native/ConflictResolverCallback.lo subversion/bindings/javahl/native/CopySources.lo subversion/bindings/javahl/native/DiffSummaryReceiver.lo subversion/bindings/javahl/native/EnumMapper.lo subversion/bindings/javahl/native/InfoCallback.lo subversion/bindings/javahl/native/Inputer.lo subversion/bindings/javahl/native/JNIByteArray.lo subversion/bindings/javahl/native/JNICriticalSection.lo subversion/bindings/javahl/native/JNIMutex.lo subversion/bindings/javahl/native/JNIStackElement.lo subversion/bindings/javahl/native/JNIStringHolder.lo subversion/bindings/javahl/native/JNIThreadData.lo subversion/bindings/javahl/native/JNIUtil.lo subversion/bindings/javahl/native/ListCallback.lo subversion/bindings/javahl/native/LogMessageCallback.l
o subversion/bindings/javahl/native/MessageReceiver.lo subversion/bindings/javahl/native/Notify.lo subversion/bindings/javahl/native/Notify2.lo subversion/bindings/javahl/native/Outputer.lo subversion/bindings/javahl/native/Path.lo subversion/bindings/javahl/native/Pool.lo subversion/bindings/javahl/native/ProgressListener.lo subversion/bindings/javahl/native/Prompter.lo subversion/bindings/javahl/native/ProplistCallback.lo subversion/bindings/javahl/native/Revision.lo subversion/bindings/javahl/native/RevisionRange.lo subversion/bindings/javahl/native/RevpropTable.lo subversion/bindings/javahl/native/SVNAdmin.lo subversion/bindings/javahl/native/SVNBase.lo subversion/bindings/javahl/native/SVNClient.lo subversion/bindings/javahl/native/StatusCallback.lo subversion/bindings/javahl/native/StringArray.lo subversion/bindings/javahl/native/Targets.lo subversion/bindings/javahl/native/libsvnjavahl.la.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_NativeResource
s.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Path.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNAdmin.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_SVNClient.lo subversion/bindings/javahl/native/org_tigris_subversion_javahl_Version.lo subversion/libsvn_repos/libsvn_repos-1.la subversion/libsvn_client/libsvn_client-1.la subversion/libsvn_wc/libsvn_wc-1.la subversion/libsvn_ra/libsvn_ra-1.la subversion/libsvn_delta/libsvn_delta-1.la subversion/libsvn_diff/libsvn_diff-1.la subversion/libsvn_subr/libsvn_subr-1.la subversion/libsvn_fs/libsvn_fs-1.la
- libsvnjavahl_OBJECTS = BlameCallback.lo ChangelistCallback.lo CommitMessage.lo ConflictResolverCallback.lo CopySources.lo DiffSummaryReceiver.lo EnumMapper.lo InfoCallback.lo Inputer.lo JNIByteArray.lo JNICriticalSection.lo JNIMutex.lo JNIStackElement.lo JNIStringHolder.lo JNIThreadData.lo JNIUtil.lo ListCallback.lo LogMessageCallback.lo MessageReceiver.lo Notify.lo Notify2.lo Outputer.lo Path.lo Pool.lo ProgressListener.lo Prompter.lo ProplistCallback.lo Revision.lo RevisionRange.lo RevpropTable.lo SVNAdmin.lo SVNBase.lo SVNClient.lo StatusCallback.lo StringArray.lo Targets.lo libsvnjavahl.la.lo org_tigris_subversion_javahl_NativeResources.lo org_tigris_subversion_javahl_Path.lo org_tigris_subversion_javahl_SVNAdmin.lo org_tigris_subversion_javahl_SVNClient.lo org_tigris_subversion_javahl_Version.lo
- subversion/bindings/javahl/native/libsvnjavahl-1.la: $(libsvnjavahl_DEPS)
-- cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(LIBS)
-+ cd subversion/bindings/javahl/native && $(LINK_JAVAHL_CXX) -o libsvnjavahl-1.la $(LT_NO_UNDEFINED) $(libsvnjavahl_OBJECTS) ../../../../subversion/libsvn_repos/libsvn_repos-1.la ../../../../subversion/libsvn_client/libsvn_client-1.la ../../../../subversion/libsvn_wc/libsvn_wc-1.la ../../../../subversion/libsvn_ra/libsvn_ra-1.la ../../../../subversion/libsvn_delta/libsvn_delta-1.la ../../../../subversion/libsvn_diff/libsvn_diff-1.la ../../../../subversion/libsvn_subr/libsvn_subr-1.la ../../../../subversion/libsvn_fs/libsvn_fs-1.la $(SVN_APRUTIL_LIBS) $(SVN_APR_LIBS) $(NEON_LIBS) $(JAVAHL_LIBS)
-
- locale_PATH = subversion/po
- locale_DEPS = subversion/po/de.mo subversion/po/es.mo subversion/po/fr.mo subversion/po/it.mo subversion/po/ja.mo subversion/po/ko.mo subversion/po/nb.mo subversion/po/pl.mo subversion/po/pt_BR.mo subversion/po/sv.mo subversion/po/zh_CN.mo subversion/po/zh_TW.mo
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