Subversion 1.14.1

[Franz Sirl]

Am 2021-09-02 um 22:00 schrieb Dagobert Michelsen via users:
> Hi Daniel,
> 
> Am 02.09.2021 um 13:26 schrieb Daniel Sahlberg <dsahlberg at apache.org>:
>> Excellent! When you do, let me know what I can do to test. (I'm not so experienced on Solaris but I will do my best).
> 
> Updated packages with plaintext passwords enable should appear here soon
> with the date of today:
>    http://buildfarm.opencsw.org/experimental.html#subversion
> Please let me know how it goes so I can push the packages to unstable/ if
> they are in good shape.
> 
> I’ll try a 64 bit rebuild after that.

Hi Dagobert,

FWIW, here my current patch for subversion that builds/tests/packages 
fine on Solaris11. On Solaris10 it builds and tests fine, but fails 
during packaging:

cd subversion/bindings/swig/perl/libsvn_swig_perl && /opt/csw/bin/bash 
"/home/fsirl/opencsw/subversion/trunk/work/build-isa-sparcv9-python_version-2.7/subversion-1.14.1/libtool" 
--tag=CC --silent --mode=link /opt/developerstudio12.6/bin/cc  -xO3 -m64 
-xarch=sparc   -xO3 -m64 -xarch=sparc  -m64 -xarch=sparc 
-L/opt/csw/bdb48/lib/64 -L/opt/csw/lib/64/64 -L/opt/csw/lib/64 -lintl 
-liconv  -L/opt/csw/bdb48/lib/64 -L/opt/csw/lib -L/opt/csw/lib 
-L/opt/csw/lib  -rpath /opt/csw/lib/64 -version-info 0  -o 
libsvn_swig_perl-1.la  swigutil_pl.lo 
../../../../../subversion/libsvn_delta/libsvn_delta-1.la 
../../../../../subversion/libsvn_subr/libsvn_subr-1.la -L/opt/csw/lib/64 
-laprutil-1 -L/opt/csw/lib/64 -lapr-1   -lsocket
ld: fatal: file .libs/swigutil_pl.o: wrong ELF class: ELFCLASS32
ld: fatal: file processing errors. No output written to 
.libs/libsvn_swig_perl-1.so.0.0.0
gmake: *** [build-outputs.mk:536: 
subversion/bindings/swig/perl/libsvn_swig_perl/libsvn_swig_perl-1.la] 
Error 2
gmake: Leaving directory 
'/home/fsirl/opencsw/subversion/trunk/work/build-isa-sparcv9-python_version-2.7/subversion-1.14.1'
gmake[1]: *** [Makefile:720: svn-perl] Error 2
gmake[1]: Leaving directory '/home/fsirl/opencsw/subversion/trunk'
gmake: *** [gar/gar.mk:202: merge-isa-sparcv9-python_version-2.7] Error 2

No idea yet on how to fix that and what is the deciding difference to 
Solaris 11 here.

Anyway, never came this far before, your py3c addition helped a lot. 
Thanks for that!

Franz.
-------------- next part --------------
Index: subversion/trunk/Makefile
===================================================================
--- subversion/trunk/Makefile	(revision 26780)
+++ subversion/trunk/Makefile	(working copy)
@@ -23,6 +23,8 @@
 VERSION = 1.14.1
 GARTYPE = v2
 
+BUILD64 = 1
+
 DESCRIPTION = Version control rethought
 define BLURB
     The goal of the Subversion project is to build a version control system 
@@ -63,7 +65,17 @@
 
 BUILD_DEP_PKGS += CSWlibexpat-dev
 BUILD_DEP_PKGS += CSWlibsqlite3-dev
+BUILD_DEP_PKGS += CSWliblz4-dev
+BUILD_DEP_PKGS += CSWlibutf8proc-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
+BUILD_DEP_PKGS += CSWsasl-dev
+BUILD_DEP_PKGS += CSWlibapr-dev
+BUILD_DEP_PKGS += CSWlibaprutil-dev
+BUILD_DEP_PKGS += CSWapache24-dev
+BUILD_DEP_PKGS += CSWlibsecret-dev
 BUILD_DEP_PKGS-5.10 += CSWlibserf-dev
+BUILD_DEP_PKGS-5.11 += CSWlibserf-dev
+BUILD_DEP_PKGS-5.10 += CSWjdk8
 BUILD_DEP_PKGS += $(BUILD_DEP_PKGS-$(GAROSREL))
 
 PACKAGES += CSWsubversion
@@ -545,6 +557,7 @@
 GARCOMPILER-5.9 = SOS12
 # We need __restrict for javahl
 GARCOMPILER-5.10 = SOS12U6
+GARCOMPILER-5.11 = SOS12U6
 GARCOMPILER += $(GARCOMPILER-$(GAROSREL))
 
 # There are lots of failing tests, needs more work
@@ -583,6 +596,12 @@
 
 CONFIGURE_ARGS += $(CONFIGURE_ARGS-$(GAROSREL)-$(MEMORYMODEL))
 
+EXTRA_CONFIGURE_ENV-32 = 
+EXTRA_CONFIGURE_ENV-64 = PKG_CONFIG_PATH=/usr/lib/64/pkgconfig
+
+EXTRA_CONFIGURE_ENV = $(EXTRA_CONFIGURE_ENV-$(MEMORYMODEL))
+EXTRA_CONFIGURE_ENV += CONFIG_SHELL=/opt/csw/bin/bash /opt/csw/bin/bash
+
 # Version from PYTHON modulation
 # This is honoured in build/find_python.sh
 EXTRA_CONFIGURE_EXPORTS += PYTHON