bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes package instalation for X f00

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11259 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2008-05-24 17:11:10 +00:00
parent d29e0bd755
commit 9b442191d9
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XOrg/lib/atk/Makefile
View File

@ -51,7 +51,7 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
endef endef
define Package/atk/Install define Package/atk/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
endef endef

2
XOrg/lib/cairo/Makefile
View File

@ -43,7 +43,7 @@ define Build/InstallDev
$(SED) "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la $(SED) "s,$(STAGING_DIR)$(STAGING_DIR),$(STAGING_DIR),g" $(1)/usr/lib/libcairo.la
endef endef
define Package/cairo/Install define Package/cairo/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
endef endef

8
XOrg/lib/gtk-2.10.14/Makefile
View File

@ -38,10 +38,16 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include} $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include}
$(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) -r $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*} $(1)/usr/lib/ $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{la,so.*,so} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
endef endef
define Package/gtk-2.10.14/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so.*,so} $(1)/usr/lib/
endef
$(eval $(call BuildPackage,gtk-2.10.14)) $(eval $(call BuildPackage,gtk-2.10.14))
$(eval $(call RequireCommand,gdk-pixbuf-csource, \ $(eval $(call RequireCommand,gdk-pixbuf-csource, \
Please install gtk2.0-dev \ Please install gtk2.0-dev \

16
XOrg/lib/pango/Makefile
View File

@ -13,7 +13,7 @@ PKG_VERSION:=1.19.4
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/ PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/
PKG_FIXUP:=libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -42,10 +42,11 @@ endef
define Build/Compile define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE) -C $(PKG_BUILD_DIR)
#$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR) $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{lib/pkgconfig,include/pango-1.0/pango/,bin/,lib/pango/1.6.0/modules}
$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{lib/pkgconfig,include/pango-1.0/pango/}
$(CP) $(PKG_BUILD_DIR)/pango/.libs/*so* $(PKG_INSTALL_DIR)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/pango/.libs/*so* $(PKG_INSTALL_DIR)/usr/lib/
rm -f $(PKG_INSTALL_DIR)/usr/lib/*T rm -f $(PKG_INSTALL_DIR)/usr/lib/*T
$(CP) $(PKG_BUILD_DIR)/pango/.libs/pango-querymodules $(PKG_INSTALL_DIR)/usr/bin/
cd $(PKG_BUILD_DIR) ;for a in `find -name pango-*.so`; do cp $$$$a $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/;done
$(CP) $(PKG_BUILD_DIR)/pango/*.la $(PKG_INSTALL_DIR)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/pango/*.la $(PKG_INSTALL_DIR)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/*.pc $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(CP) $(PKG_BUILD_DIR)/*.pc $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/
rm $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*uninstalled.pc rm $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*uninstalled.pc
@ -55,14 +56,17 @@ endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/{lib,include} $(INSTALL_DIR) $(1)/usr/{lib,include}
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(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,Libs:,Libs: -L${libdir}/libiconv/lib/ -L${libdir}/libintl/lib/ ,g' $(1)/usr/lib/pkgconfig/pango*.pc
endef endef
define Package/pango/Install define Package/pango/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/{lib,bin}
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
$(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
endef endef
$(eval $(call BuildPackage,pango)) $(eval $(call BuildPackage,pango))

6
XOrg/lib/pixman/Makefile
View File

@ -18,12 +18,14 @@ PKG_MD5SUM:=41804ac38025102dcc9891dfd4a3d105
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
define Package/pixman define Package/pixman
SECTION:=xorg-libs SECTION:=xorg-libs
CATEGORY:=Xorg CATEGORY:=Xorg
SUBMENU:=libraries SUBMENU:=libraries
TITLE:=pixman TITLE:=pixman
DEPENDS:=+xorg-server-essentials DEPENDS:=+xorg-server-essentials +gtk2.10.14
endef endef
define Build/Configure define Build/Configure
@ -48,7 +50,7 @@ define Build/InstallDev
$(CP) $(PKG_INSTALL_DIR)/* $(1)/ $(CP) $(PKG_INSTALL_DIR)/* $(1)/
endef endef
define Package/pixman/Install define Package/pixman/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
endef endef