From: Oliver Ertl <oliver@ertl-net.net>
Date: Wed, 21 Nov 2007 21:02:08 +0000 (+0000)
Subject: [Packages] liboil: Fix compilation
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=5cd792a9220eec171ec26e58485ae4144eb003a8;hp=96071a9a676e575102b17f54bc5317f3a5a690c9

[Packages] liboil: Fix compilation

SVN-Revision: 9589
---

diff --git a/libs/liboil/Makefile b/libs/liboil/Makefile
index 7722e3ec53..32514b7c29 100644
--- a/libs/liboil/Makefile
+++ b/libs/liboil/Makefile
@@ -4,7 +4,7 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: $
+# $Id:$
 
 include $(TOPDIR)/rules.mk
 
@@ -39,12 +39,16 @@ CONFIGURE_ARGS += \
 	--enable-shared \
 	--enable-static \
 
+CONFIGURE_VARS += \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libiconv/include" \
+	CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/lib/libintl/include" \
+	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libiconv/lib" \
+	LDFLAGS="$$$$LDFLAGS -L$(STAGING_DIR)/usr/lib/libintl/lib" \
+	LIBS="-lnotimpl" \
+	ac_cv_lib_m_rintf=no \
+
 define Build/Configure
-        $(call Build/Configure/Default, \
-                , \
-                LIBS="-lnotimpl" \
-                ac_cv_lib_m_rintf=no \
-        )
+	$(call Build/Configure/Default)
 	$(call libtool_disable_rpath)
 endef
 
diff --git a/libs/liboil/patches/001-no_docs.patch b/libs/liboil/patches/001-no_docs.patch
new file mode 100644
index 0000000000..18c453f2ed
--- /dev/null
+++ b/libs/liboil/patches/001-no_docs.patch
@@ -0,0 +1,13 @@
+Index: liboil-0.3.12/Makefile.in
+===================================================================
+--- liboil-0.3.12.orig/Makefile.in	2007-11-21 21:53:32.000000000 +0100
++++ liboil-0.3.12/Makefile.in	2007-11-21 21:53:47.000000000 +0100
+@@ -247,7 +247,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = liboil testsuite examples doc
++SUBDIRS = liboil testsuite
+ EXTRA_DIST = COPYING autogen.sh gtk-doc.make HACKING BUG-REPORTING
+ pkgconfig_DATA = liboil-$(LIBOIL_MAJORMINOR).pc
+ BUILT_SOURCES = liboil-$(LIBOIL_MAJORMINOR)-uninstalled.pc