From c2fe303551ed1913b401e3071dfd7f507c720872 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 6 Oct 2007 00:33:02 +0000 Subject: [PATCH] make pango and atk find the correct location of iconv and intl git-svn-id: svn://svn.openwrt.org/openwrt/packages@9155 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- XOrg/lib/atk/Makefile | 2 ++ XOrg/lib/pango/Makefile | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/XOrg/lib/atk/Makefile b/XOrg/lib/atk/Makefile index 55015e4bb..b0fb539c8 100644 --- a/XOrg/lib/atk/Makefile +++ b/XOrg/lib/atk/Makefile @@ -17,6 +17,8 @@ PKG_SOURCE_URL:=http://ftp.gnome.org/pub/gnome/sources/atk/1.11/ include $(INCLUDE_DIR)/package.mk +EXTRA_LDFLAGS:=-L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/ + define Package/atk SECTION:=xorg-libs CATEGORY:=Xorg diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile index 7109c22a5..2635d204f 100644 --- a/XOrg/lib/pango/Makefile +++ b/XOrg/lib/pango/Makefile @@ -17,11 +17,7 @@ PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.12/ include $(INCLUDE_DIR)/package.mk -EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" - -#CONFIGURE_VARS+=FONTCONFIG_LIBS="-L/usr/src/owrt-X2/staging_dir/i386/usr/lib $(STAGING_DIR)/usr/lib/libfontconfig.la -lz" - -CONFIGURE_VARS+=RELINK_DIR=$(STAGING_DIR) +EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib/ -L$(STAGING_DIR)/usr/lib/libintl/lib/ define Package/pango SECTION:=xorg-libs -- 2.11.0