lots of package cleanups/fixes

git-svn-id: svn://svn.openwrt.org/openwrt/packages@9948 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd
2007-12-27 02:12:26 +00:00
parent 76e8333cc6
commit f2e55a8fb5
30 changed files with 75 additions and 161 deletions

View File

@ -49,7 +49,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libatk-1.0.la
endef
define Package/atk/Install

View File

@ -14,11 +14,10 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:= http://cairographics.org/releases/
PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk
EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
define Package/cairo
SECTION:=xorg-libs
CATEGORY:=Xorg
@ -48,9 +47,8 @@ define Build/InstallDev
$(INSTALL_DIR) $(1)
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(SED) "s,-L/usr/local/lib,,g" $(1)/usr/lib/libcairo.la
$(SED) "s,/usr/lib/libfontconfig.la,$(1)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la
$(SED) "s,$(1)$(1),$(1),g" $(1)/usr/lib/libcairo.la
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libcairo.la
$(SED) "s,/usr/lib/libfontconfig.la,$(STAGING_DIR)/usr/lib/libfontconfig.la,g" $(1)/usr/lib/libcairo.la
$(SED) "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la
endef
define Package/cairo/Install

View File

@ -27,8 +27,8 @@ CONFIGURE_ARGS_XTRA+=--x-includes=$(STAGING_DIR)/usr/include/ \
--enable-static=yes
EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
EXTRA_LDFLAGS+=-lnotimpl
TARGET_CFLAGS+= -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include
EXTRA_LDFLAGS+=-lnotimpl -lglib -lgmodule
define Package/gtk-1.2.10
SECTION:=xorg-framework
@ -61,7 +61,6 @@ define Build/InstallDev
$(INSTALL_DIR) $(2)/bin
mv $(1)/usr/bin/gtk-config $(2)/bin/
$(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}.la
endef
$(eval $(call BuildPackage,gtk-1.2.10))

View File

@ -49,10 +49,9 @@ endef
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include}
$(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/include/
$(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/lib{gtk,gdk}*-2.0.la
endef
$(eval $(call BuildPackage,gtk-2.8.20))

View File

@ -14,6 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/enlightenment
PKG_FIXUP = libtool
include $(INCLUDE_DIR)/package.mk
@ -26,7 +27,6 @@ define Package/imlib2
endef
CONFIGURE_ARGS+=--disable-gtktest LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
EXTRA_LDFLAGS+=-lnotimpl
define Build/Configure
@ -49,7 +49,6 @@ endef
define Build/InstallDev
$(INSTALL_DIR) $(1)
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libImlib2.la
$(CP) $(PKG_BUILD_DIR)/src/modules/loaders/.libs/*.so $(1)/usr/lib/imlib2/loaders/
$(INSTALL_DIR) $(2)/bin
mv $(1)/usr/bin/imlib2-config $(2)/bin/

View File

@ -15,6 +15,7 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.eterm.org/download/
PKG_MD5SUM:=a9ec3b2da317f35869316e6d9571d296
PKG_FIXUP:=libtol
include $(INCLUDE_DIR)/package.mk
@ -52,7 +53,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*{la,so}* $(1)/usr/lib
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(2)/bin/
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libast*.la
$(SED) "s,-I/usr/include,,g" $(2)/bin/libast-config
$(SED) "s,-L/usr/lib,,g" $(2)/bin/libast-config
$(SED) "s,-L/usr/X11R6/lib,,g" $(2)/bin/libast-config

View File

@ -14,6 +14,7 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.12/
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
@ -57,7 +58,6 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(SED) "s,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g" $(1)/usr/lib/pkgconfig/pango*.pc
$(SED) "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libpango*.la
endef
define Package/pango/Install

View File

@ -14,11 +14,11 @@ PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/
PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk
CONFIGURE_ARGS_XTRA+=--enable-static --disable-vcd
EXTRA_LDLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
define Package/xine-lib
SECTION:=xorg-lib
@ -41,16 +41,14 @@ define Build/Configure
endef
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)
$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
find $(PKG_INSTALL_DIR) -name lib*.*a | xargs rm -rf
$(MAKE) -C $(PKG_BUILD_DIR)/ all install DESTDIR=$(PKG_INSTALL_DIR)
endef
define Build/InstallDev
$(INSTALL_DIR) $(1)
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
$(SED) 's,-I$$$${prefix}/include,-I$(1)/usr/include/,g' $(1)/usr/bin/xine-config
$(SED) 's,-L$$$${exec_prefix}/lib,-L$(1)/usr/lib/,g' $(1)/usr/bin/xine-config
$(SED) 's,-I$$$${prefix}/include,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/xine-config
$(SED) 's,-L$$$${exec_prefix}/lib,-L$(STAGING_DIR)/usr/lib/,g' $(1)/usr/bin/xine-config
$(INSTALL_DIR) $(2)/bin
mv $(1)/usr/bin/xine-config $(2)/bin
endef