Author: maho
Date: Mon May 28 11:58:24 2012
New Revision: 1343213
URL: http://svn.apache.org/viewvc?rev=1343213&view=rev
Log:
FreeBSD 10 support.
Added:
incubator/ooo/trunk/ext_libraries/apr/apr-1.4.5.patch
Modified:
incubator/ooo/trunk/ext_libraries/apr/makefile.mk
Added: incubator/ooo/trunk/ext_libraries/apr/apr-1.4.5.patch
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/apr-1.4.5.patch?rev=1343213&view=auto
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/apr-1.4.5.patch (added)
+++ incubator/ooo/trunk/ext_libraries/apr/apr-1.4.5.patch Mon May 28 11:58:24
2012
@@ -0,0 +1,173 @@
+--- misc/build/apr-1.4.5/configure.orig 2011-05-19 17:09:22.000000000
-0700
++++ misc/build/apr-1.4.5/configure 2012-05-21 23:51:51.000000000 -0700
+@@ -13468,7 +13468,7 @@
+ hardcode_shlibpath_var=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs=no
+ ;;
+
+@@ -13484,7 +13484,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_direct=yes
+ hardcode_minus_L=yes
+@@ -14117,7 +14117,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -14128,7 +14128,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -14146,7 +14146,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -16199,7 +16199,7 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[12].*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ ld_shlibs_CXX=no
+ ;;
+@@ -17739,7 +17739,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -17750,7 +17750,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -17768,7 +17768,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -19717,7 +19717,7 @@
+ hardcode_shlibpath_var_F77=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_F77=no
+ ;;
+
+@@ -19733,7 +19733,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_F77=yes
+ hardcode_minus_L_F77=yes
+@@ -20314,7 +20314,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -20325,7 +20325,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -20343,7 +20343,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -22288,7 +22288,7 @@
+ hardcode_shlibpath_var_GCJ=no
+ ;;
+
+- freebsd1*)
++ freebsd1.*)
+ ld_shlibs_GCJ=no
+ ;;
+
+@@ -22304,7 +22304,7 @@
+ ;;
+
+ # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+- freebsd2*)
++ freebsd2.*)
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs
$linker_flags'
+ hardcode_direct_GCJ=yes
+ hardcode_minus_L_GCJ=yes
+@@ -22885,7 +22885,7 @@
+ shlibpath_var=LD_LIBRARY_PATH
+ ;;
+
+-freebsd1*)
++freebsd1.*)
+ dynamic_linker=no
+ ;;
+
+@@ -22896,7 +22896,7 @@
+ objformat=`/usr/bin/objformat`
+ else
+ case $host_os in
+- freebsd[123]*) objformat=aout ;;
++ freebsd[123].*) objformat=aout ;;
+ *) objformat=elf ;;
+ esac
+ fi
+@@ -22914,7 +22914,7 @@
+ esac
+ shlibpath_var=LD_LIBRARY_PATH
+ case $host_os in
+- freebsd2*)
++ freebsd2.*)
+ shlibpath_overrides_runpath=yes
+ ;;
+ freebsd3.[01]* | freebsdelf3.[01]*)
Modified: incubator/ooo/trunk/ext_libraries/apr/makefile.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/ext_libraries/apr/makefile.mk?rev=1343213&r1=1343212&r2=1343213&view=diff
==============================================================================
--- incubator/ooo/trunk/ext_libraries/apr/makefile.mk (original)
+++ incubator/ooo/trunk/ext_libraries/apr/makefile.mk Mon May 28 11:58:24 2012
@@ -37,6 +37,8 @@ APRVERSION=$(APR_MAJOR).$(APR_MINOR).$(A
TARFILE_NAME=$(PRJNAME)-$(APRVERSION)
TARFILE_MD5=97262fe54dddaf583eaaee3497a426e1
+PATCH_FILES=apr-1.4.5.patch
+
.IF "$(OS)"=="WNT"
CONFIGURE_ACTION=cp include/apr.hw include/apr.h
