diff --git a/x11/gnome/eel/Makefile b/x11/gnome/eel/Makefile index 2e2334b9d93..e38b1424c9b 100644 --- a/x11/gnome/eel/Makefile +++ b/x11/gnome/eel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2003/03/02 21:08:39 pvalchev Exp $ +# $OpenBSD: Makefile,v 1.3 2003/03/28 07:19:36 marcm Exp $ COMMENT= "Eazel Extensions Library" @@ -29,6 +29,6 @@ USE_GMAKE= Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= ${CONFIGURE_SHARED} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib -pthread" + LDFLAGS="-L${LOCALBASE}/lib" .include diff --git a/x11/gnome/eel/patches/patch-ltmain_sh b/x11/gnome/eel/patches/patch-ltmain_sh index 1779b8bc35c..23df2169d97 100644 --- a/x11/gnome/eel/patches/patch-ltmain_sh +++ b/x11/gnome/eel/patches/patch-ltmain_sh @@ -1,6 +1,6 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:48:50 todd Exp $ ---- ltmain.sh.orig Fri Sep 13 17:01:26 2002 -+++ ltmain.sh Mon Sep 23 16:21:58 2002 +$OpenBSD: patch-ltmain_sh,v 1.2 2003/03/28 07:19:37 marcm Exp $ +--- ltmain.sh.orig Mon Nov 18 14:47:25 2002 ++++ ltmain.sh Sun Mar 2 21:38:12 2003 @@ -1060,6 +1060,17 @@ compiler." continue ;; @@ -19,17 +19,28 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:48:50 todd Exp $ -module) module=yes continue -@@ -1496,6 +1507,9 @@ compiler." +@@ -1496,6 +1507,20 @@ compiler." fi continue ;; -+ -pthread) -+ 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 -@@ -1737,11 +1751,6 @@ compiler." +@@ -1737,11 +1762,6 @@ compiler." continue fi @@ -41,7 +52,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 18:48:50 todd Exp $ if test -n "$old_archive_from_expsyms_cmds"; then # figure out the soname set dummy $library_names -@@ -4450,40 +4459,6 @@ relink_command=\"$relink_command\"" +@@ -4450,40 +4470,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = : && exit 0