radhermit 14/11/20 17:26:54
Added: binwalk-2.0.1-makefile.patch
binwalk-2.0.1-libs.patch
Log:
Version bump.
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
4AB3E85B4F064CA3)
Revision Changes Path
1.1 app-misc/binwalk/files/binwalk-2.0.1-makefile.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/binwalk/files/binwalk-2.0.1-makefile.patch?rev=1.1&content-type=text/plain
Index: binwalk-2.0.1-makefile.patch
===================================================================
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
1.1 app-misc/binwalk/files/binwalk-2.0.1-libs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/binwalk/files/binwalk-2.0.1-libs.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/binwalk/files/binwalk-2.0.1-libs.patch?rev=1.1&content-type=text/plain
Index: binwalk-2.0.1-libs.patch
===================================================================
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))
