support for kde 3.2
This commit is contained in:
espie
parent
65104dc48e
commit
970032258c
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: kde.port.mk,v 1.5 2003/05/22 20:25:33 marcm Exp $
|
||||
# $OpenBSD: kde.port.mk,v 1.6 2004/02/01 14:55:03 espie Exp $
|
||||
MODULES+= qt3
|
||||
MODQT_OVERRIDE_UIC?=No
|
||||
MODQT_MT?=Yes
|
||||
@ -36,6 +36,9 @@ SUBST_VARS+= KDE
|
||||
MODKDE_VERSION?=
|
||||
.if ${MODKDE_VERSION} == "3.1"
|
||||
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.1/patch-* patch-*
|
||||
.elif ${MODKDE_VERSION} == "3.2"
|
||||
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.2/patch-* patch-*
|
||||
LIB_DEPENDS+=lib/qt3/qt-mt.3.20::x11/qt3,mt
|
||||
.elif ${MODKDE_VERSION} == "2.2.2"
|
||||
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-2.2.2/patch-* patch-*
|
||||
.endif
|
||||
|
||||
97
x11/kde/patches-3.2/patch-aclocal_m4
Normal file
97
x11/kde/patches-3.2/patch-aclocal_m4
Normal file
@ -0,0 +1,97 @@
|
||||
$OpenBSD: patch-aclocal_m4,v 1.1 2004/02/01 14:55:03 espie Exp $
|
||||
--- aclocal.m4.orig 2004-01-18 18:32:48.000000000 +0100
|
||||
+++ aclocal.m4 2004-01-22 14:45:34.000000000 +0100
|
||||
@@ -6448,6 +6448,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER]
|
||||
[AC_MSG_CHECKING([dynamic linker characteristics])
|
||||
library_names_spec=
|
||||
libname_spec='lib$name'
|
||||
+modname_spec='lib$name'
|
||||
soname_spec=
|
||||
shrext=".so"
|
||||
postinstall_cmds=
|
||||
@@ -6850,6 +6851,7 @@ openbsd*)
|
||||
need_lib_prefix=no
|
||||
need_version=no
|
||||
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
||||
+ modname_spec='lib_$name'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
shlibpath_var=LD_LIBRARY_PATH
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
@@ -7579,6 +7581,7 @@ openbsd*)
|
||||
else
|
||||
lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||
fi
|
||||
+ lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
osf3* | osf4* | osf5*)
|
||||
@@ -8526,6 +8529,16 @@ case $host_os in
|
||||
# Workaround some broken pre-1.5 toolchains
|
||||
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
||||
;;
|
||||
+ 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)
|
||||
@@ -8899,15 +8912,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
|
||||
;;
|
||||
@@ -9164,7 +9186,8 @@ if test -f "$ltmain"; then
|
||||
# careful not to overquote the AC_SUBSTed values. We take copies of the
|
||||
# variables and quote the copies for generation of the libtool script.
|
||||
for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
|
||||
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
|
||||
+ libname_spec modname_spec library_names_spec soname_spec \
|
||||
+ extract_expsyms_cmds \
|
||||
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
|
||||
deplibs_check_method reload_flag reload_cmds need_locks \
|
||||
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
|
||||
@@ -9428,6 +9451,7 @@ version_type=$version_type
|
||||
|
||||
# Format of library name prefix.
|
||||
libname_spec=$lt_libname_spec
|
||||
+modname_spec=$lt_modname_spec
|
||||
|
||||
# List of archive names. First name is the real one, the rest are links.
|
||||
# The last name is the one that the linker finds with -lNAME.
|
||||
@@ -10857,6 +10881,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*)
|
||||
51
x11/kde/patches-3.2/patch-admin_ltmain_sh
Normal file
51
x11/kde/patches-3.2/patch-admin_ltmain_sh
Normal file
@ -0,0 +1,51 @@
|
||||
$OpenBSD: patch-admin_ltmain_sh,v 1.1 2004/02/01 14:55:03 espie Exp $
|
||||
--- admin/ltmain.sh.orig 2003-09-24 10:44:01.000000000 +0200
|
||||
+++ admin/ltmain.sh 2004-01-20 18:19:24.000000000 +0100
|
||||
@@ -1294,6 +1294,17 @@ EOF
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -1973,6 +1984,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
|
||||
@@ -2785,7 +2810,7 @@ EOF
|
||||
# Add the "lib" prefix for modules if required
|
||||
name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
|
||||
eval shared_ext=\"$shrext\"
|
||||
- eval libname=\"$libname_spec\"
|
||||
+ eval libname=\"$modname_spec\"
|
||||
else
|
||||
libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user