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

fixed XOrg lib meta files

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@8893 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2007-09-20 22:15:50 +00:00
parent 74169df440
commit 1529fe3383
2 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
XOrg/lib/common.mk
View File

@ -10,10 +10,28 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/lib/
_CATEGORY:=libraries _CATEGORY:=libraries
_DEPEND+=+xorg-headers-native +util-macros-X11R7.2 _DEPEND+=+xorg-headers-native +util-macros-X11R7.2
include ../../common.mk include ../../common.mk
ifeq ("$(PKG_NAME)","libX11-X11R7.2")
CONFIGURE_ARGS_XTRA=--without-xcb
endif
define libX11-X11R7.2/Compile
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys
endef
define libXt-X11R7.2/Compile
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc"
endef
define Build/Compile define Build/Compile
$(call $(PKG_NAME)/Compile)
make -C $(PKG_BUILD_DIR) make -C $(PKG_BUILD_DIR)
mkdir -p $(PKG_INSTALL_DIR)
DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
endef endef
define Build/Configure define Build/Configure
@ -36,17 +54,12 @@ endef
define Package/${PKG_NAME}/install define Package/${PKG_NAME}/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
if [ -d $(PKG_BUILD_DIR)/src/.libs/ ]; then \ find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib
cp -f $(PKG_BUILD_DIR)/src/.libs/lib*so* $(1)/usr/lib ; \
fi
if [ -d $(PKG_BUILD_DIR)/.libs/ ]; then \
cp -f $(PKG_BUILD_DIR)/.libs/lib*so* $(1)/usr/lib ; \
fi
$(call $(PKG_NAME)/install,$(1)) $(call $(PKG_NAME)/install,$(1))
endef endef
define Build/InstallDev define Build/InstallDev
DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE) $(MAKE_FLAGS) install DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
rm -rf $(STAGING_DIR)/usr/lib/*.la rm -rf $(STAGING_DIR)/usr/lib/*.la
endef endef

22
XOrg/lib/template.mk
View File

@ -7,28 +7,6 @@ PKG_VERSION:=@VER@
_DEPEND:=@DEP@ _DEPEND:=@DEP@
include ../common.mk include ../common.mk
ifeq ("$(PKG_NAME)","libX11-X11R7.2")
#CONFIGURE_ARGS_XTRA=--without-xcb --disable-udc --enable-xcms --disable-xlocale --disable-xkb
CONFIGURE_ARGS_XTRA=--without-xcb
define Build/Compile
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \
$(MAKE_FLAGS) \
all ;
endef
endif
ifeq ("$(PKG_NAME)","libXt-X11R7.2")
define Build/Compile
$(MAKE_VARS) \
$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc"
make -C $(PKG_BUILD_DIR)
endef
endif
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,$(PKG_NAME)))