diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2017-04-26 01:54:28 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2017-04-26 02:22:58 -0400 |
| commit | 23687f976a125f9b24231d9d8511843083461612 (patch) | |
| tree | b34594cdbc6446a8d9b43ba90d72a87effd0448d /app-misc/binwalk/files | |
| parent | app-misc/binwalk: stabilize 2.1.1 (diff) | |
| download | gentoo-23687f976a125f9b24231d9d8511843083461612.tar.gz gentoo-23687f976a125f9b24231d9d8511843083461612.tar.bz2 gentoo-23687f976a125f9b24231d9d8511843083461612.zip | |
app-misc/binwalk: remove old
Diffstat (limited to 'app-misc/binwalk/files')
| -rw-r--r-- | app-misc/binwalk/files/binwalk-2.0.1-libs.patch | 14 | ||||
| -rw-r--r-- | app-misc/binwalk/files/binwalk-2.0.1-makefile.patch | 61 |
2 files changed, 0 insertions, 75 deletions
diff --git a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch b/app-misc/binwalk/files/binwalk-2.0.1-libs.patch deleted file mode 100644 index 5a746a4176fc..000000000000 --- a/app-misc/binwalk/files/binwalk-2.0.1-libs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Don't install C libs by default since we don't need to install them for -every python version since they aren't linked with libpython. - ---- binwalk-2.0.1/setup.py -+++ binwalk-2.0.1/setup.py -@@ -134,7 +134,7 @@ - - # The data files to install along with the module - data_dirs = ["magic", "config", "plugins", "modules", "core"] --install_data_files = [os.path.join("libs", "*.so")] -+install_data_files = [] - - for data_dir in data_dirs: - install_data_files.append("%s%s*" % (data_dir, os.path.sep)) diff --git a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch b/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch deleted file mode 100644 index e70f096ea6b4..000000000000 --- a/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch +++ /dev/null @@ -1,61 +0,0 @@ -Don't build python via the makefile and fix parallel make jobs. - ---- binwalk-2.0.1/Makefile.in -+++ binwalk-2.0.1/Makefile.in -@@ -33,21 +33,20 @@ - $(PYTHON) ./setup.py install $(PREFIX) - - build: -- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi -- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR); fi -- $(PYTHON) ./setup.py build -+ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR); fi -+ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR); fi - - deps: - ./deps.sh - - clean: -- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) clean; fi -- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) clean; fi -+ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) clean; fi -+ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) clean; fi - $(PYTHON) ./setup.py clean - - distclean: clean -- if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR) distclean; fi -- if [ "$(BUILD_BUNDLES)" -eq "1" ]; then make -C $(SRC_BUNDLES_DIR) distclean; fi -+ if [ "$(BUILD_C_LIBS)" -eq "1" ]; then $(MAKE) -C $(SRC_C_DIR) distclean; fi -+ if [ "$(BUILD_BUNDLES)" -eq "1" ]; then $(MAKE) -C $(SRC_BUNDLES_DIR) distclean; fi - rm -rf Makefile config.* *.cache - - uninstall: ---- binwalk-2.0.1/src/C/Makefile -+++ binwalk-2.0.1/src/C/Makefile -@@ -3,9 +3,9 @@ - .PHONY: all clean_libs clean distclean - - all: -- make -C miniz -+ $(MAKE) -C miniz - cp miniz/*.$(SOEXT) $(LIB_DIR) -- make -C compress -+ $(MAKE) -C compress - cp compress/*.$(SOEXT) $(LIB_DIR) - - clean_libs: -@@ -13,10 +13,10 @@ - rm -f $(LIB_DIR)/libcompress42.$(SOEXT) - - clean: clean_libs -- make -C miniz clean -- make -C compress clean -+ $(MAKE) -C miniz clean -+ $(MAKE) -C compress clean - - distclean: clean_libs -- make -C miniz distclean -- make -C compress distclean -+ $(MAKE) -C miniz distclean -+ $(MAKE) -C compress distclean - |