summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-08-11 00:15:36 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-08-11 00:15:36 +0000
commitc8baec72b57b07e40b47a20a038299ea00c23f64 (patch)
treec0cc9dcd1a48ca61202ea89b88b7daa36db75d3a
parenta0525c29028ef599fddb31e96cc4b0835008a5d2 (diff)
Disable freetype explicitly, since it is now included
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1607 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/package/libgd/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/openwrt/package/libgd/Makefile b/openwrt/package/libgd/Makefile
index c180dd815..1f0776f04 100644
--- a/openwrt/package/libgd/Makefile
+++ b/openwrt/package/libgd/Makefile
@@ -23,10 +23,8 @@ $(PKG_BUILD_DIR)/.configured:
$(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
- LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+ LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
LIBPNG12_CONFIG="$(STAGING_DIR)/usr/bin/libpng12-config" \
- sys_lib_dlsearch_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
- sys_lib_search_path_spec="$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib" \
./configure \
--target=$(GNU_TARGET_NAME) \
--host=$(GNU_TARGET_NAME) \
@@ -51,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured:
--enable-static \
--disable-rpath \
--without-x \
+ --without-freetype \
--with-png=$(STAGING_DIR)/usr \
)
touch $@