updated libgtk2

This commit is contained in:
John Voltz 2008-03-06 18:15:42 +00:00
parent 84c82f9fd5
commit 5b5cf3bf36
27 changed files with 158 additions and 303 deletions

View File

@ -7,6 +7,9 @@ config BR2_PACKAGE_LIBGTK2
select BR2_PACKAGE_JPEG
select BR2_PACKAGE_TIFF
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_CUPS
select BR2_PACKAGE_LIBPNG
select BR2_PACKAGE_LIBGLIB2
depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7||BR2_PACKAGE_TINYX
help
The GTK+ version 2 graphical user interface library

View File

@ -1,107 +0,0 @@
# GdkPixbuf Image Loader Modules file
# Automatically generated file, do not edit
# Created by gdk-pixbuf-query-loaders from gtk+-2.10.7
#
# LoaderDir = /lib/gtk-2.0/2.10.0/loaders
#
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-png.so"
"png" 5 "gtk20" "The PNG image format"
"image/png" ""
"png" ""
"\211PNG\r\n\032\n" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-jpeg.so"
"jpeg" 5 "gtk20" "The JPEG image format"
"image/jpeg" ""
"jpeg" "jpe" "jpg" ""
"\377\330" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-gif.so"
"gif" 4 "gtk20" "The GIF image format"
"image/gif" ""
"gif" ""
"GIF8" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ico.so"
"ico" 5 "gtk20" "The ICO image format"
"image/x-icon" ""
"ico" "cur" ""
" \001 " "zz znz" 100
" \002 " "zz znz" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ani.so"
"ani" 4 "gtk20" "The ANI image format"
"application/x-navi-animation" ""
"ani" ""
"RIFF ACON" " xxxx " 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-ras.so"
"ras" 4 "gtk20" "The Sun raster image format"
"image/x-cmu-raster" "image/x-sun-raster" ""
"ras" ""
"Y\246j\225" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xpm.so"
"xpm" 4 "gtk20" "The XPM image format"
"image/x-xpixmap" ""
"xpm" ""
"/* XPM */" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tiff.so"
"tiff" 1 "gtk20" "The TIFF image format"
"image/tiff" ""
"tiff" "tif" ""
"MM *" " z " 100
"II* " " z" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pnm.so"
"pnm" 4 "gtk20" "The PNM/PBM/PGM/PPM image format family"
"image/x-portable-anymap" "image/x-portable-bitmap" "image/x-portable-graymap" "image/x-portable-pixmap" ""
"pnm" "pbm" "pgm" "ppm" ""
"P1" "" 100
"P2" "" 100
"P3" "" 100
"P4" "" 100
"P5" "" 100
"P6" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-bmp.so"
"bmp" 5 "gtk20" "The BMP image format"
"image/bmp" "image/x-bmp" "image/x-MS-bmp" ""
"bmp" ""
"BM" "" 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-wbmp.so"
"wbmp" 4 "gtk20" "The WBMP image format"
"image/vnd.wap.wbmp" ""
"wbmp" ""
" " "z" 1
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-xbm.so"
"xbm" 4 "gtk20" "The XBM image format"
"image/x-xbitmap" ""
"xbm" ""
"#define " "" 100
"/*" "" 50
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-tga.so"
"tga" 4 "gtk20" "The Targa image format"
"image/x-tga" ""
"tga" "targa" ""
" \001\001" "x " 100
" \001\t" "x " 100
" \002" "xz " 99
" \003" "xz " 100
" \n" "xz " 100
" \013" "xz " 100
"/lib/gtk-2.0/2.10.0/loaders/libpixbufloader-pcx.so"
"pcx" 4 "gtk20" "The PCX image format"
"image/x-pcx" ""
"pcx" ""
"\n \001" "" 100
"\n\002\001" "" 100
"\n\003\001" "" 100
"\n\004\001" "" 100
"\n\005\001" "" 100

View File

@ -1,35 +0,0 @@
# GTK+ Input Method Modules file
# Automatically generated file, do not edit
# Created by gtk-query-immodules-2.0 from gtk+-2.10.7
#
#
"/lib/gtk-2.0/2.10.0/immodules/im-xim.so"
"xim" "X Input Method" "gtk20" "/usr/share/locale" "ko:ja:th:zh"
"/lib/gtk-2.0/2.10.0/immodules/im-am-et.so"
"am_et" "Amharic (EZ+)" "gtk20" "/usr/share/locale" "am"
"/lib/gtk-2.0/2.10.0/immodules/im-cedilla.so"
"cedilla" "Cedilla" "gtk20" "/usr/share/locale" "az:ca:co:fr:gv:oc:pt:sq:tr:wa"
"/lib/gtk-2.0/2.10.0/immodules/im-cyrillic-translit.so"
"cyrillic_translit" "Cyrillic (Transliterated)" "gtk20" "/usr/share/locale" ""
"/lib/gtk-2.0/2.10.0/immodules/im-inuktitut.so"
"inuktitut" "Inuktitut (Transliterated)" "gtk20" "/usr/share/locale" "iu"
"/lib/gtk-2.0/2.10.0/immodules/im-ipa.so"
"ipa" "IPA" "gtk20" "/usr/share/locale" ""
"/lib/gtk-2.0/2.10.0/immodules/im-thai.so"
"thai" "Thai-Lao" "gtk+" "/usr/share/locale" "lo:th"
"/lib/gtk-2.0/2.10.0/immodules/im-ti-er.so"
"ti_er" "Tigrigna-Eritrean (EZ+)" "gtk20" "/usr/share/locale" "ti"
"/lib/gtk-2.0/2.10.0/immodules/im-ti-et.so"
"ti_et" "Tigrigna-Ethiopian (EZ+)" "gtk20" "/usr/share/locale" "ti"
"/lib/gtk-2.0/2.10.0/immodules/im-viqr.so"
"viqr" "Vietnamese (VIQR)" "gtk20" "/usr/share/locale" "vi"

View File

@ -0,0 +1,11 @@
--- a/Makefile.in 2008-01-28 22:38:09.000000000 -0500
+++ b/Makefile.in 2008-02-11 12:52:45.000000000 -0500
@@ -330,7 +330,7 @@ sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib
+SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos perf contrib
SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros
# require automake 1.4

View File

@ -3,171 +3,77 @@
# libgtk2.0
#
#############################################################
LIBGTK2_VERSION:=2.10.9
LIBGTK2_SOURCE:=gtk+-$(LIBGTK2_VERSION).tar.bz2
LIBGTK2_SITE:=ftp://ftp.gtk.org/pub/gtk/v2.10
LIBGTK2_CAT:=$(BZCAT)
LIBGTK2_DIR:=$(BUILD_DIR)/gtk+-$(LIBGTK2_VERSION)
LIBGTK2_BINARY:=libgtk-x11-2.0.a
LIBGTK2_VERSION = 2.12.6
LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.bz2
LIBGTK2_SITE = ftp://ftp.gtk.org/pub/gtk/2.12
LIBGTK2_AUTORECONF = NO
LIBGTK2_INSTALL_STAGING = YES
LIBGTK2_INSTALL_TARGET = YES
LIBGTK2_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install
LIBGTK2_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
LIBGTK2_BUILD_ENV= \
$(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
ac_cv_func_posix_getpwuid_r=yes \
glib_cv_stack_grows=no \
glib_cv_uscore=no \
ac_cv_func_strtod=yes \
ac_fsusage_space=yes \
fu_cv_sys_stat_statfs2_bsize=yes \
ac_cv_func_closedir_void=no \
ac_cv_func_getloadavg=no \
ac_cv_lib_util_getloadavg=no \
ac_cv_lib_getloadavg_getloadavg=no \
ac_cv_func_getgroups=yes \
ac_cv_func_getgroups_works=yes \
ac_cv_func_chown_works=yes \
ac_cv_have_decl_euidaccess=no \
ac_cv_func_euidaccess=no \
ac_cv_have_decl_strnlen=yes \
ac_cv_func_strnlen_working=yes \
ac_cv_func_lstat_dereferences_slashed_symlink=yes \
ac_cv_func_lstat_empty_string_bug=no \
ac_cv_func_stat_empty_string_bug=no \
vb_cv_func_rename_trailing_slash_bug=no \
ac_cv_have_decl_nanosleep=yes \
jm_cv_func_nanosleep_works=yes \
gl_cv_func_working_utimes=yes \
ac_cv_func_utime_null=yes \
ac_cv_have_decl_strerror_r=yes \
ac_cv_func_strerror_r_char_p=no \
jm_cv_func_svid_putenv=yes \
ac_cv_func_getcwd_null=yes \
ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes \
utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no \
ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes \
gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes \
ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes \
jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes \
jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no \
ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no \
gl_cv_func_getcwd_null=yes \
gl_cv_func_getcwd_path_max=yes \
ac_cv_func_fnmatch_gnu=yes \
am_getline_needs_run_time_check=no \
am_cv_func_working_getline=yes \
gl_cv_func_mkdir_trailing_slash_bug=no \
gl_cv_func_mkstemp_limitations=no \
ac_cv_func_working_mktime=yes \
jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no \
gl_cv_c_restrict=no \
LIBGTK2_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
glib_cv_uscore=no ac_cv_func_strtod=yes \
ac_fsusage_space=yes fu_cv_sys_stat_statfs2_bsize=yes \
ac_cv_func_closedir_void=no ac_cv_func_getloadavg=no \
ac_cv_lib_util_getloadavg=no ac_cv_lib_getloadavg_getloadavg=no \
ac_cv_func_getgroups=yes ac_cv_func_getgroups_works=yes \
ac_cv_func_chown_works=yes ac_cv_have_decl_euidaccess=no \
ac_cv_func_euidaccess=no ac_cv_have_decl_strnlen=yes \
ac_cv_func_strnlen_working=yes ac_cv_func_lstat_dereferences_slashed_symlink=yes \
ac_cv_func_lstat_empty_string_bug=no ac_cv_func_stat_empty_string_bug=no \
vb_cv_func_rename_trailing_slash_bug=no ac_cv_have_decl_nanosleep=yes \
jm_cv_func_nanosleep_works=yes gl_cv_func_working_utimes=yes \
ac_cv_func_utime_null=yes ac_cv_have_decl_strerror_r=yes \
ac_cv_func_strerror_r_char_p=no jm_cv_func_svid_putenv=yes \
ac_cv_func_getcwd_null=yes ac_cv_func_getdelim=yes \
ac_cv_func_mkstemp=yes utils_cv_func_mkstemp_limitations=no \
utils_cv_func_mkdir_trailing_slash_bug=no ac_cv_func_memcmp_working=yes \
ac_cv_have_decl_malloc=yes gl_cv_func_malloc_0_nonnull=yes \
ac_cv_func_malloc_0_nonnull=yes ac_cv_func_calloc_0_nonnull=yes \
ac_cv_func_realloc_0_nonnull=yes jm_cv_func_gettimeofday_clobber=no \
gl_cv_func_working_readdir=yes jm_ac_cv_func_link_follows_symlink=no \
utils_cv_localtime_cache=no ac_cv_struct_st_mtim_nsec=no \
gl_cv_func_tzset_clobber=no gl_cv_func_getcwd_null=yes \
gl_cv_func_getcwd_path_max=yes ac_cv_func_fnmatch_gnu=yes \
am_getline_needs_run_time_check=no am_cv_func_working_getline=yes \
gl_cv_func_mkdir_trailing_slash_bug=no gl_cv_func_mkstemp_limitations=no \
ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
ac_use_included_regex=no gl_cv_c_restrict=no \
ac_cv_path_GLIB_GENMARSHAL=/usr/bin/glib-genmarshal \
ac_cv_prog_F77=no \
ac_cv_prog_CXX=no \
ac_cv_path_CUPS_CONFIG=no
ac_cv_path_GTK_UPDATE_ICON_CACHE=/usr/bin/gtk-update-icon-cache \
ac_cv_path_GDK_PIXBUF_CSOURCE=/usr/bin/gdk-pixbuf-csource \
ac_cv_prog_F77=no ac_cv_prog_CXX=no ac_cv_path_CUPS_CONFIG=no
$(DL_DIR)/$(LIBGTK2_SOURCE):
$(WGET) -P $(DL_DIR) $(LIBGTK2_SITE)/$(LIBGTK2_SOURCE)
libgtk2-source: $(DL_DIR)/$(LIBGTK2_SOURCE)
$(LIBGTK2_DIR)/.unpacked: $(DL_DIR)/$(LIBGTK2_SOURCE)
$(LIBGTK2_CAT) $(DL_DIR)/$(LIBGTK2_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
toolchain/patch-kernel.sh $(LIBGTK2_DIR) package/libgtk2/ \*.patch*
$(CONFIG_UPDATE) $(LIBGTK2_DIR)
touch $(LIBGTK2_DIR)/.unpacked
$(LIBGTK2_DIR)/.configured: $(LIBGTK2_DIR)/.unpacked
# The following is an truely evil hack!
# I dont yet understand why configure is not doing this right
# TODO: also remove 'odd-include-problem.patch' when this is fixed
$(SED) "s,^GDK_DEP_CFLAGS=.*,GDK_DEP_CFLAGS=\'-pthread -I$(STAGING_DIR)/usr/include/glib-2.0 -I$(STAGING_DIR)/lib/glib-2.0/include -I$(STAGING_DIR)/usr/include/pango-1.0 -I$(STAGING_DIR)/usr/include/cairo\',g" $(LIBGTK2_DIR)/configure
$(SED) "s,^GDK_DEP_LIBS=.*,GDK_DEP_LIBS=\'-L$(STAGING_DIR)/lib -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -lfontconfig -lXext -lXrender -lX11 -lXinerama -lXrandr -lXcursor -lXfixes -lXft -lm\',g" $(LIBGTK2_DIR)/configure
(cd $(LIBGTK2_DIR); rm -rf config.cache; \
$(LIBGTK2_BUILD_ENV) \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) \
--prefix=/usr \
--exec-prefix=/usr \
--bindir=/usr/bin \
--sbindir=/usr/sbin \
--libdir=/lib \
--libexecdir=/usr/lib \
--sysconfdir=/etc \
--datadir=/usr/share \
--localstatedir=/var \
--includedir=/usr/include \
--mandir=/usr/man \
--infodir=/usr/info \
--enable-shared \
LIBGTK2_CONF_OPT = --target=$(GNU_TARGET_NAME) --host=$(GNU_TARGET_NAME) \
--build=$(GNU_HOST_NAME) --prefix=/usr \
--exec-prefix=/usr --bindir=/usr/bin \
--sbindir=/usr/sbin --libdir=/usr/lib \
--libexecdir=/usr/lib --sysconfdir=/etc \
--datadir=/usr/share --localstatedir=/var \
--includedir=/usr/include --mandir=/usr/man \
--infodir=/usr/info --enable-shared \
--enable-static \
--with-x \
--disable-glibtest --enable-explicit-deps=no \
--disable-debug PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
$(LIBGTK2_CONF_OPT_X) $(LIBGTK2_CONF_OPT_DFB)
ifeq ($(BR2_PACKAGE_DIRECTFB),y)
LIBGTK2_CONF_OPT += --with-gdktarget=directfb
LIBGTK2_DEPENDENCIES_EXTRA = directfb
endif
ifneq ($(BR2_PACKAGE_XSERVER_none),y)
LIBGTK2_CONF_OPT += --with-x \
--x-includes=$(STAGING_DIR)/usr/include/X11 \
--x-libraries=$(STAGING_DIR)/usr/lib \
--disable-glibtest \
--enable-explicit-deps=no \
--disable-debug \
)
touch $(LIBGTK2_DIR)/.configured
$(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/.configured
$(LIBGTK2_BUILD_ENV) $(MAKE) CC=$(TARGET_CC) -C $(LIBGTK2_DIR)
touch -c $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY)
$(STAGING_DIR)/lib/$(LIBGTK2_BINARY): $(LIBGTK2_DIR)/gtk/.libs/$(LIBGTK2_BINARY)
$(MAKE) DESTDIR=$(STAGING_DIR) -C $(LIBGTK2_DIR) install
touch -c $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
$(TARGET_DIR)/lib/libgtk-x11-2.0.so.0: $(STAGING_DIR)/lib/$(LIBGTK2_BINARY)
cp -a $(STAGING_DIR)/lib/libgtk-x11-2.0.so $(TARGET_DIR)/lib/
cp -a $(STAGING_DIR)/lib/libgtk-x11-2.0.so.0* $(TARGET_DIR)/lib/
cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so $(TARGET_DIR)/lib/
cp -a $(STAGING_DIR)/lib/libgdk*-2.0.so.0* $(TARGET_DIR)/lib/
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0*
$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/lib/libgdk*-2.0.so.0*
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/engines/*.so \
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/engines/
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/printbackends/*.so \
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/printbackends/
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/immodules/*.so \
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/immodules/
mkdir -p $(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders
cp -a $(STAGING_DIR)/lib/gtk-2.0/2.10.0/loaders/*.so \
$(TARGET_DIR)/lib/gtk-2.0/2.10.0/loaders/
mkdir -p $(TARGET_DIR)/etc/gtk-2.0
cp package/libgtk2/gdk-pixbuf.loaders $(TARGET_DIR)/etc/gtk-2.0
cp package/libgtk2/gtk.immodules $(TARGET_DIR)/etc/gtk-2.0
touch -c $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
libgtk2: uclibc png jpeg tiff $(XSERVER) libglib2 \
cairo pango atk $(TARGET_DIR)/lib/libgtk-x11-2.0.so.0
libgtk2-clean:
rm -f $(TARGET_DIR)/lib/libgtk* $(TARGET_DIR)/lib/libgdk*
-$(MAKE) -C $(LIBGTK2_DIR) clean
libgtk2-dirclean:
rm -rf $(LIBGTK2_DIR)
#############################################################
#
# Toplevel Makefile options
#
#############################################################
ifeq ($(strip $(BR2_PACKAGE_LIBGTK2)),y)
TARGETS+=libgtk2
--with-gdktarget=x11
LIBGTK2_DEPENDENCIES_EXTRA = xlib_libXcomposite $(XSERVER)
else
LIBGTK2_CONF_OPT += --without-x
endif
LIBGTK2_DEPENDENCIES = uclibc png jpeg tiff $(LIBGTK2_DEPENDENCIES_EXTRA) libglib2 cups cairo pango atk
$(eval $(call AUTOTARGETS,package,libgtk2))

View File

@ -0,0 +1,77 @@
--- gtk/ltmain.sh.orig 2004-11-23 09:19:19.000000000 -0700
+++ gtk/ltmain.sh 2007-01-13 14:36:53.000000000 -0700
@@ -231,8 +231,9 @@
# line option must be used.
if test -z "$tagname"; then
$echo "$modename: unable to infer tagged configuration"
- $echo "$modename: specify a tag with \`--tag'" 1>&2
- exit $EXIT_FAILURE
+ $echo "$modename: defaulting to \`CC'"
+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
+# exit $EXIT_FAILURE
# else
# $echo "$modename: using $tagname tagged configuration"
fi
@@ -2279,8 +2280,14 @@
absdir="$abs_ladir"
libdir="$abs_ladir"
else
- dir="$libdir"
- absdir="$libdir"
+ # Adding 'libdir' from the .la file to our library search paths
+ # breaks crosscompilation horribly. We cheat here and don't add
+ # it, instead adding the path where we found the .la. -CL
+ dir="$abs_ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ #dir="$libdir"
+ #absdir="$libdir"
fi
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
@@ -2754,6 +2761,16 @@
esac
if grep "^installed=no" $deplib > /dev/null; then
path="$absdir/$objdir"
+# This interferes with crosscompilation. -CL
+# else
+# eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+# if test -z "$libdir"; then
+# $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+# exit 1
+# fi
+# if test "$absdir" != "$libdir"; then
+# $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+# fi
else
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -z "$libdir"; then
@@ -5141,6 +5158,10 @@
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
+ # Replacing uninstalled with installed can easily break crosscompilation,
+ # since the installed path is generally the wrong architecture. -CL
+ newdependency_libs="$newdependency_libs $deplib"
+ continue
case $deplib in
*.la)
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
@@ -5459,10 +5480,13 @@
# At present, this check doesn't affect windows .dll's that
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
- if test "$inst_prefix_dir" = "$destdir"; then
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
- exit $EXIT_FAILURE
- fi
+ #
+ # This breaks install into our staging area. -PB
+ #
+ # if test "$inst_prefix_dir" = "$destdir"; then
+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ # exit $EXIT_FAILURE
+ # fi
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.