remove intrusive patch, proper fix is [5820], Makefile cleanup

[openwrt/svn-archive/archive.git] / libs / libart / Makefile

diff --git a/libs/libart/Makefile b/libs/libart/Makefile
index 5288b630a46bd0b8acc516d6145a5e5bb6213ba4..45d7525ba6275f768095211a67a5799de703b6ad 100644 (file)
--- a/libs/libart/Makefile
+++ b/libs/libart/Makefile
@@ -12,12 +12,12 @@ PKG_NAME:=libart
 PKG_VERSION:=2.3.17
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)_lgpl-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3
 PKG_MD5SUM:=f1f6b3e5490f382535dccb288f5d8b14
 PKG_CAT:=zcat
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_lgpl-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
@@ -26,59 +26,29 @@ define Package/libart
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=An high-performance 2D graphics library
-  DESCRIPTION:=An high-performance 2D graphics library.\\\
-    A library of functions for 2D graphics supporting a superset of the \\\
-    PostScript imaging model, designed to be integrated with graphics, artwork, \\\
-    and illustration programs. It is written in optimized C, and is fully \\\
-    compatible with C++. With a small footprint of 10,000 lines of code, it is \\\
-    especially suitable for embedded applications.
+  DESCRIPTION:=\
+       A library of functions for 2D graphics supporting a superset of the \\\
+       PostScript imaging model, designed to be integrated with graphics, artwork, \\\
+       and illustration programs. It is written in optimized C, and is fully \\\
+       compatible with C++. With a small footprint of 10,000 lines of code, it is \\\
+       especially suitable for embedded applications.
   URL:=http://www.levien.com/libart/
 endef
 
 define Build/Configure
-       (cd $(PKG_BUILD_DIR); rm -f config.cache; \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib" \
-               $(TARGET_CONFIGURE_OPTS) \
-               ./configure \
-                       --target=$(GNU_TARGET_NAME) \
-                       --host=$(GNU_TARGET_NAME) \
-                       --build=$(GNU_HOST_NAME) \
-                       --program-prefix="" \
-                       --program-suffix="" \
-                       --prefix=/usr \
-                       --exec-prefix=/usr \
-                       --bindir=/usr/bin \
-                       --sbindir=/usr/sbin \
-                       --libexecdir=/usr/lib \
-                       --sysconfdir=/etc \
-                       --datadir=/usr/share \
-                       --localstatedir=/var \
-                       --mandir=/usr/man \
-                       --infodir=/usr/info \
-                       $(DISABLE_NLS) \
-                       $(DISABLE_LARGEFILE) \
-                       --enable-shared=yes \
-                       --enable-static=yes \
-                       --disable-rpath \
-       );
+       $(call Build/Configure/Default, \
+               --enable-shared \
+               --enable-static \
+       )
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
                HOSTCC="$(HOSTCC)" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
                all install
 endef
 
-define Package/libart/install
-       install -d -m0755 $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/
-endef
-
 define Build/InstallDev
        mkdir -p $(STAGING_DIR)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/libart2-config $(STAGING_DIR)/usr/bin/
@@ -100,4 +70,9 @@ define Build/UninstallDev
                $(STAGING_DIR)/usr/lib/pkgconfig/libart-2.0.pc
 endef
 
+define Package/libart/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libart_lgpl_2.so.* $(1)/usr/lib/
+endef
+
 $(eval $(call BuildPackage,libart))