mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
removing old libpng patch and it only patched autotools files and isn't really needed, running the autotools does all this for us.
This commit is contained in:
@@ -1,160 +0,0 @@
|
||||
diff -ur libpng-1.2.29/aclocal.m4 libpng-1.2.29-haiku/aclocal.m4
|
||||
--- libpng-1.2.29/aclocal.m4 2008-05-08 11:58:29.000000000 +0000
|
||||
+++ libpng-1.2.29-haiku/aclocal.m4 2008-05-26 08:54:27.000000000 +0000
|
||||
@@ -1741,7 +1741,7 @@
|
||||
lt_cv_dlopen_libs=
|
||||
|
||||
case $host_os in
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
lt_cv_dlopen="load_add_on"
|
||||
lt_cv_dlopen_libs=
|
||||
lt_cv_dlopen_self=yes
|
||||
@@ -2188,7 +2188,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
library_names_spec='${libname}${shared_ext}'
|
||||
dynamic_linker="$host_os ld.so"
|
||||
shlibpath_var=LIBRARY_PATH
|
||||
@@ -2986,7 +2986,7 @@
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
@@ -3257,7 +3257,7 @@
|
||||
[AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
LIBM=
|
||||
case $host in
|
||||
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
+*-*-beos* | *-*-haiku* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
|
||||
# These system don't have libm, or don't need it
|
||||
;;
|
||||
*-ncr-sysv4.3*)
|
||||
@@ -3569,7 +3569,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
mingw* | cygwin* | os2* | pw32*)
|
||||
@@ -3867,7 +3867,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
@@ -4285,7 +4285,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
||||
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
||||
@@ -5570,7 +5570,7 @@
|
||||
fi
|
||||
;;
|
||||
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
|
||||
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
||||
diff -ur libpng-1.2.29/config.guess libpng-1.2.29-haiku/config.guess
|
||||
--- libpng-1.2.29/config.guess 2008-05-02 03:50:32.000000000 +0000
|
||||
+++ libpng-1.2.29-haiku/config.guess 2008-05-25 16:59:19.000000000 +0000
|
||||
@@ -1216,6 +1216,12 @@
|
||||
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
|
||||
echo i586-pc-beos
|
||||
exit ;;
|
||||
+ BeMac:Haiku:*:*)
|
||||
+ echo powerpc-apple-haiku
|
||||
+ exit ;;
|
||||
+ BePC:Haiku:*:*)
|
||||
+ echo i586-pc-haiku
|
||||
+ exit ;;
|
||||
SX-4:SUPER-UX:*:*)
|
||||
echo sx4-nec-superux${UNAME_RELEASE}
|
||||
exit ;;
|
||||
diff -ur libpng-1.2.29/configure libpng-1.2.29-haiku/configure
|
||||
--- libpng-1.2.29/configure 2008-05-08 11:58:30.000000000 +0000
|
||||
+++ libpng-1.2.29-haiku/configure 2008-05-26 09:00:00.000000000 +0000
|
||||
@@ -5423,7 +5423,7 @@
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
@@ -7761,7 +7761,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
+ beos* | haiku* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
@@ -8357,7 +8357,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
allow_undefined_flag=unsupported
|
||||
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
|
||||
@@ -9684,7 +9684,7 @@
|
||||
esac
|
||||
;;
|
||||
|
||||
-beos*)
|
||||
+beos* | haiku*)
|
||||
library_names_spec='${libname}${shared_ext}'
|
||||
dynamic_linker="$host_os ld.so"
|
||||
shlibpath_var=LIBRARY_PATH
|
||||
@@ -10378,7 +10378,7 @@
|
||||
lt_cv_dlopen_libs=
|
||||
|
||||
case $host_os in
|
||||
- beos*)
|
||||
+ beos* | haiku*)
|
||||
lt_cv_dlopen="load_add_on"
|
||||
lt_cv_dlopen_libs=
|
||||
lt_cv_dlopen_self=yes
|
||||
diff -ur libpng-1.2.29/ltmain.sh libpng-1.2.29-haiku/ltmain.sh
|
||||
--- libpng-1.2.29/ltmain.sh 2008-05-02 03:51:25.000000000 +0000
|
||||
+++ libpng-1.2.29-haiku/ltmain.sh 2008-05-26 09:02:08.000000000 +0000
|
||||
@@ -3995,7 +3995,7 @@
|
||||
-l*)
|
||||
if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
|
||||
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-*-haiku*)
|
||||
# These systems don't actually have a C or math library (as such)
|
||||
continue
|
||||
;;
|
||||
@@ -5951,7 +5951,7 @@
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
if test -n "$rpath"; then
|
||||
case $host in
|
||||
- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
|
||||
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-*-haiku*)
|
||||
# these systems don't actually have a c library (as such)!
|
||||
;;
|
||||
*-*-rhapsody* | *-*-darwin1.[012])
|
||||
Reference in New Issue
Block a user