don't build your own libintl. remove old unneeded libtool patch while here.
This commit is contained in:
steven
parent
cc2d26a5e4
commit
97aa070a0d
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.22 2007/09/06 19:15:13 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.23 2007/11/01 12:59:15 steven Exp $
|
||||
|
||||
COMMENT= free user interface builder for GTK+ and GNOME
|
||||
|
||||
DISTNAME= glade-0.6.4
|
||||
PKGNAME= ${DISTNAME}p4
|
||||
PKGNAME= ${DISTNAME}p5
|
||||
CATEGORIES= devel
|
||||
|
||||
HOMEPAGE= http://glade.gnome.org/
|
||||
@ -33,6 +33,8 @@ CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= --without-bonobo
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
LDFLAGS="-L${LOCALBASE}/lib"
|
||||
# avoid bundled libintl headers
|
||||
MAKE_FLAGS= INCLUDES=
|
||||
|
||||
WANTLIB= X11 Xau Xdmcp Xext Xi c glib gmodule iconv intl m
|
||||
.if ${FLAVOR:L:Mgnome}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.3 2002/02/12 19:11:37 nino Exp $
|
||||
$OpenBSD: patch-configure,v 1.4 2007/11/01 12:59:15 steven Exp $
|
||||
--- configure.orig Fri Feb 1 20:32:41 2002
|
||||
+++ configure Tue Feb 12 19:44:43 2002
|
||||
@@ -15,6 +15,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset
|
||||
+++ configure Thu Nov 1 14:09:57 2007
|
||||
@@ -15,6 +15,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
|
||||
*-DOS) lt_cv_sys_path_separator=';' ;;
|
||||
*) lt_cv_sys_path_separator=':' ;;
|
||||
esac
|
||||
@ -106,14 +106,41 @@ $OpenBSD: patch-configure,v 1.3 2002/02/12 19:11:37 nino Exp $
|
||||
fi
|
||||
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||
@@ -8957,6 +9004,10 @@ echo "$as_me:8956: result: $gt_cv_func_g
|
||||
echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6
|
||||
fi
|
||||
@@ -8848,7 +8895,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lintl $LIBS"
|
||||
+LIBS="-lintl -liconv $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 8853 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -8903,7 +8950,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lintl $LIBS"
|
||||
+LIBS="-lintl -liconv $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
#line 8908 "configure"
|
||||
#include "confdefs.h"
|
||||
@@ -8959,6 +9006,10 @@ fi
|
||||
|
||||
+ fi
|
||||
+
|
||||
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
||||
+ LIBS="$LIBS -lintl";
|
||||
fi
|
||||
|
||||
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
||||
+ LIBS="$LIBS -lintl";
|
||||
+ fi
|
||||
+
|
||||
if test "$gt_cv_func_gettext_libc" = "yes" \
|
||||
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
||||
cat >>confdefs.h <<\EOF
|
||||
@@ -10611,7 +10662,7 @@ s,@GENCAT@,$GENCAT,;t t
|
||||
s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
|
||||
s,@CATALOGS@,$CATALOGS,;t t
|
||||
s,@CATOBJEXT@,$CATOBJEXT,;t t
|
||||
-s,@DATADIRNAME@,$DATADIRNAME,;t t
|
||||
+s,@DATADIRNAME@,share,;t t
|
||||
s,@GMOFILES@,$GMOFILES,;t t
|
||||
s,@INSTOBJEXT@,$INSTOBJEXT,;t t
|
||||
s,@INTLDEPS@,$INTLDEPS,;t t
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
$OpenBSD: patch-ltmain_sh,v 1.3 2002/02/12 19:11:37 nino Exp $
|
||||
--- ltmain.sh.orig Tue Sep 4 22:58:41 2001
|
||||
+++ ltmain.sh Thu Jan 31 22:45:48 2002
|
||||
@@ -1058,6 +1058,17 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
|
||||
+ -pthread)
|
||||
+ case $host in
|
||||
+ *-*-openbsd*)
|
||||
+ deplibs="$deplibs $arg"
|
||||
+ ;;
|
||||
+ *)
|
||||
+ continue
|
||||
+ ;;
|
||||
+ esac
|
||||
+ ;;
|
||||
+
|
||||
-module)
|
||||
module=yes
|
||||
continue
|
||||
@@ -4444,40 +4455,6 @@ relink_command=\"$relink_command\""
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
- echo "----------------------------------------------------------------------"
|
||||
- echo "Libraries have been installed in:"
|
||||
- for libdir in $libdirs; do
|
||||
- echo " $libdir"
|
||||
- done
|
||||
- echo
|
||||
- echo "If you ever happen to want to link against installed libraries"
|
||||
- echo "in a given directory, LIBDIR, you must either use libtool, and"
|
||||
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
|
||||
- echo "flag during linking and do at least one of the following:"
|
||||
- if test -n "$shlibpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
|
||||
- echo " during execution"
|
||||
- fi
|
||||
- if test -n "$runpath_var"; then
|
||||
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
|
||||
- echo " during linking"
|
||||
- fi
|
||||
- if test -n "$hardcode_libdir_flag_spec"; then
|
||||
- libdir=LIBDIR
|
||||
- eval flag=\"$hardcode_libdir_flag_spec\"
|
||||
-
|
||||
- echo " - use the \`$flag' linker flag"
|
||||
- fi
|
||||
- if test -n "$admincmds"; then
|
||||
- echo " - have your system administrator run these commands:$admincmds"
|
||||
- fi
|
||||
- if test -f /etc/ld.so.conf; then
|
||||
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
|
||||
- fi
|
||||
- echo
|
||||
- echo "See any operating system documentation about shared libraries for"
|
||||
- echo "more information, such as the ld(1) and ld.so(8) manual pages."
|
||||
- echo "----------------------------------------------------------------------"
|
||||
exit 0
|
||||
;;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user