cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove workaround

Browse Source
This commit is contained in:
brad 2002-06-02 07:01:47 +00:00
parent 9072aa44da
commit b5fb940b17
2 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
graphics/gdk-pixbuf/patches/patch-aclocal_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $ $OpenBSD: patch-aclocal_m4,v 1.4 2002/06/02 07:01:47 brad Exp $
--- aclocal.m4.orig Thu Apr 18 18:52:35 2002 --- aclocal.m4.orig Thu Apr 18 18:52:35 2002
+++ aclocal.m4 Sun May 26 12:45:36 2002 +++ aclocal.m4 Sun Jun 2 02:55:01 2002
@@ -863,8 +863,15 @@ old_postinstall_cmds='chmod 644 $oldlib' @@ -863,8 +863,15 @@ old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds= old_postuninstall_cmds=
@ -48,7 +48,7 @@ $OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $
hardcode_shlibpath_var=no hardcode_shlibpath_var=no
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec='${wl}-R$libdir'
+ export_dynamic_flag_spec='${wl}-E' + export_dynamic_flag_spec='${wl}-E'
+ else + else
+ case "$host_os" in + case "$host_os" in
@ -58,14 +58,14 @@ $OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $
+ ;; + ;;
+ *) + *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + hardcode_libdir_flag_spec='${wl}-R$libdir'
+ ;; + ;;
+ esac + esac
+ fi + fi
;; ;;
os2*) os2*)
@@ -2148,9 +2171,19 @@ newsos6) @@ -2148,9 +2171,21 @@ newsos6)
openbsd*) openbsd*)
version_type=sunos version_type=sunos
@ -74,6 +74,8 @@ $OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $
- need_version=no - need_version=no
+ need_lib_prefix=no + need_lib_prefix=no
+ need_version=no + need_version=no
+ sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_search_path_spec="/usr/lib /usr/local/lib"
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ case "$host_os" in + case "$host_os" in
+ openbsd2.[[89]] | openbsd2.[[89]].*) + openbsd2.[[89]] | openbsd2.[[89]].*)
@ -88,20 +90,14 @@ $OpenBSD: patch-aclocal_m4,v 1.3 2002/05/31 02:41:44 brad Exp $
fi fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
@@ -3281,6 +3314,16 @@ newos6*) @@ -3281,6 +3316,10 @@ newos6*)
[lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'] [lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)']
lt_cv_file_magic_cmd=/usr/bin/file lt_cv_file_magic_cmd=/usr/bin/file
lt_cv_file_magic_test_file=/usr/lib/libnls.so lt_cv_file_magic_test_file=/usr/lib/libnls.so
+ ;; + ;;
+ +
+openbsd*) +openbsd*)
+ lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+ else
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+ fi
;; ;;
osf3* | osf4* | osf5*) osf3* | osf4* | osf5*)

15
graphics/gdk-pixbuf/patches/patch-ltmain_sh
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-ltmain_sh,v 1.3 2002/05/31 02:41:44 brad Exp $
--- ltmain.sh.orig Thu May 30 22:04:26 2002
+++ ltmain.sh Thu May 30 22:04:51 2002
@@ -1725,11 +1725,6 @@ compiler."
continue
fi
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
- need_relink=yes
- fi
-
if test -n "$old_archive_from_expsyms_cmds"; then
# figure out the soname
set dummy $library_names