From a89fcd284ef04c6884c96ff266c1de5b2a8bc4d8 Mon Sep 17 00:00:00 2001 From: espie Date: Sat, 8 Feb 2003 12:56:50 +0000 Subject: [PATCH] moved to kde module --- x11/kde/arts3/patches/p-aclocal_m4 | 100 ------------------------ x11/kde/arts3/patches/p-admin_ltmain_sh | 42 ---------- 2 files changed, 142 deletions(-) delete mode 100644 x11/kde/arts3/patches/p-aclocal_m4 delete mode 100644 x11/kde/arts3/patches/p-admin_ltmain_sh diff --git a/x11/kde/arts3/patches/p-aclocal_m4 b/x11/kde/arts3/patches/p-aclocal_m4 deleted file mode 100644 index eb363c9b691..00000000000 --- a/x11/kde/arts3/patches/p-aclocal_m4 +++ /dev/null @@ -1,100 +0,0 @@ -$OpenBSD: p-aclocal_m4,v 1.6 2003/01/27 19:10:47 espie Exp $ ---- aclocal.m4.orig Fri Jan 24 15:15:51 2003 -+++ aclocal.m4 Mon Jan 27 17:17:21 2003 -@@ -6075,8 +6075,8 @@ nto-qnx) - - openbsd*) - version_type=sunos -- need_lib_prefix=no -- need_version=no -+ need_lib_prefix=yes -+ need_version=yes - library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -6749,6 +6749,7 @@ openbsd*) - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi -+ lt_cv_deplibs_check_method=pass_all - ;; - - osf3* | osf4* | osf5*) -@@ -7502,6 +7503,16 @@ case $host_os in - netbsd*) - # NetBSD uses g++ - do we need to do anything? - ;; -+ openbsd*) -+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes -+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no -+ -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R$libdir' -+ _LT_AC_TAGVAR(remove_libsearchpath, $1)='yes' -+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes' -+ ;; - osf3*) - case $cc_basename in - KCC) -@@ -7816,15 +7827,24 @@ if AC_TRY_EVAL(ac_compile); then - else - _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" - fi -+ if test "x$_LT_AC_TAGVAR(remove_libsearchpath, $1)" = "xyes"; then -+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)="" -+ fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else -+ add="${prev}$p" -+ if test "x$_LT_AC_TAGVAR(remove_lgcc, $1)" = "xyes"; then -+ case "$add" in -+ -lgcc ) add="" ;; -+ esac -+ fi - if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then -- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}" -+ _LT_AC_TAGVAR(postdeps, $1)="$add" - else -- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}" -+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${add}" - fi - fi - ;; -@@ -9614,22 +9634,9 @@ EOF - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - -- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -- else -- case $host_os in -- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -- ;; -- *) -- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -- ;; -- esac -- fi -+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R$libdir' - ;; - - os2*) -@@ -9638,6 +9645,7 @@ EOF - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes' - ;; - - osf3*) diff --git a/x11/kde/arts3/patches/p-admin_ltmain_sh b/x11/kde/arts3/patches/p-admin_ltmain_sh deleted file mode 100644 index bdaf048c04f..00000000000 --- a/x11/kde/arts3/patches/p-admin_ltmain_sh +++ /dev/null @@ -1,42 +0,0 @@ -$OpenBSD: p-admin_ltmain_sh,v 1.1 2003/01/05 16:58:57 espie Exp $ ---- admin/ltmain.sh.orig Sun Jan 5 16:49:09 2003 -+++ admin/ltmain.sh Sun Jan 5 17:04:25 2003 -@@ -1249,6 +1249,17 @@ EOF - continue - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1841,6 +1852,20 @@ EOF - fi - continue - ;; -+ -pthread) -+ case $linkmode in -+ lib) -+ deplibs="$deplib $deplibs" -+ newdependency_libs="$deplib $newdependency_libs" -+ ;; -+ prog) -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ ;; -+ esac -+ continue -+ ;; -+ - %DEPLIBS%) - alldeplibs=yes - continue