diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-15 10:20:07 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-15 10:20:07 +0200 |
| commit | 96a83976f70dc1bfcedadcf94f59502ab2b4014d (patch) | |
| tree | eec7b010ae00fcaa9e8fbacc3a7e04bf486ad8c4 | |
| parent | f7bb2f756421b8e2a9e0bb8a010713b48c44969d (diff) | |
fix patch usage
| -rw-r--r-- | mk/vars.mk | 1 | ||||
| -rw-r--r-- | package/python2/Makefile | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mk/vars.mk b/mk/vars.mk index 3ae3f1d67..947aacbed 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -169,6 +169,7 @@ LDFLAGS_FOR_BUILD?= -L$(STAGING_HOST_DIR)/usr/lib FLAGS_FOR_BUILD= ${CPPFLAGS_FOR_BUILD} ${CFLAGS_FOR_BUILD} ${LDFLAGS_FOR_BUILD} PATCH= PATH=${HOST_PATH} ${BASH} $(SCRIPT_DIR)/patch.sh +PATCHP0= PATH=${HOST_PATH} patch -p0 SED:= PATH=${HOST_PATH} sed -i -e LINUX_DIR:= $(BUILD_DIR)/linux KERNEL_MODULE_FLAGS:= ARCH=${ARCH} \ diff --git a/package/python2/Makefile b/package/python2/Makefile index b5aac2032..757e6adc5 100644 --- a/package/python2/Makefile +++ b/package/python2/Makefile @@ -108,7 +108,7 @@ hostpre-configure: $(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD) $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - (cd $(WRKBUILD) && patch -p0 < patch-Lib_distutils_sysconfig_py) + (cd $(WRKBUILD) && ${PATCHP0} < patch-Lib_distutils_sysconfig_py) $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ $(WRKBUILD)/Misc/python-config.in @@ -119,13 +119,13 @@ hostpost-install: $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/python-config.patch $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/python-config.patch (cd $(STAGING_HOST_DIR)/usr/bin && \ - patch -p0 < $(WRKBUILD)/python-config.patch) + ${PATCHP0} < $(WRKBUILD)/python-config.patch) pre-configure: $(CP) $(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py $(WRKBUILD) $(SED) "s#@@STAGING_TARGET_DIR@@#$(STAGING_TARGET_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py $(SED) "s#@@STAGING_HOST_DIR@@#$(STAGING_HOST_DIR)#" $(WRKBUILD)/patch-Lib_distutils_sysconfig_py - (cd $(WRKBUILD) && patch -p0 <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py) + (cd $(WRKBUILD) && ${PATCHP0} <$(WRKBUILD)/patch-Lib_distutils_sysconfig_py) $(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \ $(WRKBUILD)/Misc/python-config.in |