[packages] liboil:

- change dependency on libnotimpl to build-time only
 - don't package .so symlink
 - fix pkgconfig
 - bumb release number


git-svn-id: svn://svn.openwrt.org/openwrt/packages@10905 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2008-04-21 21:58:12 +00:00
parent a549e1ccdb
commit ccd1a664d2
2 changed files with 29 additions and 11 deletions

View File

@ -1,21 +1,22 @@
#
# Copyright (C) 2007 OpenWrt.org
# Copyright (C) 2007-2008 OpenWrt.org
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
# $Id:$
# $Id$
include $(TOPDIR)/rules.mk
PKG_NAME:=liboil
PKG_VERSION:=0.3.12
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://liboil.freedesktop.org/download/
PKG_MD5SUM:=96ee4c627ffb0db3999cef3c7454b1d9
PKG_BUILD_DEPENDS:=libnotimpl
PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk
@ -23,7 +24,6 @@ include $(INCLUDE_DIR)/package.mk
define Package/liboil
SECTION:=libs
CATEGORY:=Libraries
DEPENDS:=+libnotimpl
TITLE:=simple functions optimized for various CPUs
URL:=http://liboil.freedesktop.org/wiki/
endef
@ -54,18 +54,17 @@ define Build/Compile
endef
define Build/InstallDev
mkdir -p $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/liboil-0.3/ $(1)/usr/include/
mkdir -p $(1)/usr/lib
$(INSTALL_DIR) $(1)/usr/include
$(CP) $(PKG_INSTALL_DIR)/usr/include/liboil-0.3 $(1)/usr/include/
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.{a,so*} $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig
$(CP) $(PKG_BUILD_DIR)/liboil.pc $(1)/usr/lib/pkgconfig/
$(SED) 's,$(TARGET_LDFLAGS),,g' $(1)/usr/lib/pkgconfig/liboil.pc
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/liboil-0.3.pc $(1)/usr/lib/pkgconfig/
endef
define Package/liboil/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/liboil-0.3.so.* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,liboil))

View File

@ -0,0 +1,19 @@
--- liboil-0.3.12/liboil.pc.in.orig 2006-10-11 07:12:30.000000000 +0200
+++ liboil-0.3.12/liboil.pc.in 2008-04-04 10:22:24.000000000 +0200
@@ -1,7 +1,7 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-includedir=@includedir@/liboil-@LIBOIL_MAJORMINOR@
+includedir=@includedir@
toolsdir=${exec_prefix}/bin
@@ -9,6 +9,6 @@
Description: Library of Optimized Inner Loops
Version: @VERSION@
Libs: -L${libdir} -loil-@LIBOIL_MAJORMINOR@ -lm
-Cflags: -I${includedir}
+Cflags: -I${includedir}/liboil-@LIBOIL_MAJORMINOR@