summaryrefslogtreecommitdiff
path: root/libxmlsec
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2007-07-05 07:51:39 +0000
committerRüdiger Timm <rt@openoffice.org>2007-07-05 07:51:39 +0000
commit63267c640d9bafb1c51a5e222b11baab042ec06b (patch)
tree7db1ce6c1e8b411eb8dcaecd5d046b7f1355d7cf /libxmlsec
parentc495ae7f183345284beb5b3be127b85d763ca4ad (diff)
INTEGRATION: CWS freebsd08 (1.20.2); FILE MERGED
2007/06/01 22:56:34 maho 1.20.2.1: /usr/bin/objformat is gone for 7-CURRENT. Issue number: #i76141# Submitted by: jkim
Diffstat (limited to 'libxmlsec')
-rw-r--r--libxmlsec/xmlsec1-1.2.6.patch68
1 files changed, 68 insertions, 0 deletions
diff --git a/libxmlsec/xmlsec1-1.2.6.patch b/libxmlsec/xmlsec1-1.2.6.patch
index 096cdcb8faaa..c0dce44fa339 100644
--- a/libxmlsec/xmlsec1-1.2.6.patch
+++ b/libxmlsec/xmlsec1-1.2.6.patch
@@ -158,6 +158,23 @@
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
***************
+*** 7778,7784 ****
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+--- 7779,7785 ----
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+***************
*** 9046,9052 ****
;;
esac
@@ -215,6 +232,23 @@
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
***************
+*** 11497,11503 ****
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+--- 11498,11504 ----
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+***************
*** 13259,13269 ****
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -257,6 +291,23 @@
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
***************
+*** 14667,14673 ****
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+--- 14668,14674 ----
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+***************
*** 15607,15617 ****
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -316,6 +367,23 @@
# is EXPORTS), use it as is; otherwise, prepend...
archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
***************
+*** 17035,17041 ****
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+--- 17036,17042 ----
+ ;;
+
+ freebsd*)
+! objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+***************
*** 24598,24604 ****
fi