fix for 10-CURRENT (possibly).
PR: 168234 Submitted by: truckman@
This commit is contained in:
parent
70e10cfc4e
commit
b8224b48a9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=297568
2 changed files with 1231 additions and 0 deletions
187
editors/openoffice-3-devel/files/patch-apr
Normal file
187
editors/openoffice-3-devel/files/patch-apr
Normal file
|
@ -0,0 +1,187 @@
|
|||
--- ../ext_libraries/apr/makefile.mk.orig 2012-03-05 00:28:09.000000000 -0800
|
||||
+++ ../ext_libraries/apr/makefile.mk 2012-05-18 00:06:26.000000000 -0700
|
||||
@@ -37,6 +37,8 @@
|
||||
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
|
||||
--- /dev/null 2012-05-21 23:57:08.000000000 -0700
|
||||
+++ ../ext_libraries/apr/apr-1.4.5.patch 2012-05-21 23:53:48.000000000 -0700
|
||||
@@ -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]*)
|
1044
editors/openoffice-3-devel/files/patch-coinmp
Normal file
1044
editors/openoffice-3-devel/files/patch-coinmp
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue