Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python: remove explicit rules in favor of using make/configure vars

Browse source 
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2014-10-28 22:57:14 +02:00 committed by Alexandru Ardelean
parent 7be9485564
commit 0ea587ad24
1 changed files with 29 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
lang/python/Makefile
View file

@ -72,24 +72,22 @@ define Package/python-full/description
endef endef
MAKE_FLAGS:=\ MAKE_FLAGS:=\
$(TARGET_CONFIGURE_OPTS) \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
CROSS_COMPILE=yes \ CROSS_COMPILE=yes \
CFLAGS="$(TARGET_CFLAGS) -DNDEBUG -fno-inline" \
LDFLAGS="$(TARGET_LDFLAGS) -L$(PKG_BUILD_DIR)" \
LD="$(TARGET_CC)" \ LD="$(TARGET_CC)" \
PGEN=pgen2 PGEN=pgen2
EXTRA_CFLAGS+= \
-DNDEBUG -fno-inline
EXTRA_LDFLAGS+= \
-L$(PKG_BUILD_DIR)
ENABLE_IPV6:= ENABLE_IPV6:=
ifeq ($(CONFIG_IPV6),y) ifeq ($(CONFIG_IPV6),y)
ENABLE_IPV6 += --enable-ipv6 ENABLE_IPV6 += --enable-ipv6
endif endif
define Build/Configure CONFIGURE_ARGS+= \
-$(MAKE) -C $(PKG_BUILD_DIR) distclean
(cd $(PKG_BUILD_DIR); autoreconf --force --install || exit 0)
$(CP) ./files/config.site $(PKG_BUILD_DIR)
$(call Build/Configure/Default, \
--sysconfdir=/etc \ --sysconfdir=/etc \
--enable-shared \ --enable-shared \
--without-cxx-main \ --without-cxx-main \
@ -99,10 +97,15 @@ define Build/Configure
--without-pymalloc \ --without-pymalloc \
$(ENABLE_IPV6) \ $(ENABLE_IPV6) \
CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \ CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
OPT="$(TARGET_CFLAGS)" \ OPT="$(TARGET_CFLAGS)"
)
define Hooks/Configure/Pre/ConfigSiteInstall
$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
endef endef
Hooks/Configure/Pre+=\
Hooks/Configure/Pre/ConfigSiteInstall
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib $(INSTALL_DIR) $(2)/bin $(1)/usr/bin $(1)/usr/include $(1)/usr/lib
$(INSTALL_DIR) $(STAGING_DIR)/mk/ $(INSTALL_DIR) $(STAGING_DIR)/mk/
@ -167,33 +170,16 @@ define PyPackage/python/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpython$(PYTHON_VERSION).so* $(1)/usr/lib/
endef endef
define Host/Configure HOST_CONFIGURE_ARGS+= \
-$(MAKE) -C $(HOST_BUILD_DIR) distclean
(cd $(HOST_BUILD_DIR); autoreconf --force --install || exit 0)
(cd $(HOST_BUILD_DIR); \
rm -rf config.cache; \
CONFIG_SITE= \
OPT="$(HOST_CFLAGS)" \
./configure \
--without-cxx-main \ --without-cxx-main \
--without-ensurepip \ --without-ensurepip \
--without-pymalloc \ --without-pymalloc \
--with-threads \ --with-threads \
--prefix=$(STAGING_DIR_HOST); \ --prefix=$(STAGING_DIR_HOST)
)
endef
define Host/Compile
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
python Parser/pgen
+$(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) \
sharedmods
endef
define Host/Install define Host/Install
$(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/ $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin/
$(MAKE) -C $(HOST_BUILD_DIR) \ $(MAKE) -C $(HOST_BUILD_DIR) install
install
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2 $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(STAGING_DIR_HOST)/bin/pgen2
endef endef