From 324f72f82023f7bd6e5dbcd11f207db75f6cf9bb Mon Sep 17 00:00:00 2001 From: John Marino Date: Sun, 8 Dec 2013 21:13:56 +0000 Subject: [PATCH] devel/ros: Properly support specified gmake This port needs gmake, but "make" was hardcoded. This fix unbreaks it on head where bmake is default. --- devel/ros/files/patch-tools_rospack_Makefile | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 devel/ros/files/patch-tools_rospack_Makefile diff --git a/devel/ros/files/patch-tools_rospack_Makefile b/devel/ros/files/patch-tools_rospack_Makefile new file mode 100644 index 000000000000..6e5cd9b5fded --- /dev/null +++ b/devel/ros/files/patch-tools_rospack_Makefile @@ -0,0 +1,39 @@ +--- tools/rospack/Makefile.orig 2011-09-02 17:53:09.000000000 +0000 ++++ tools/rospack/Makefile +@@ -10,28 +10,28 @@ all: + -mkdir -p bin + @if ! (cd build && cmake ..); then \ + echo "[rosbuild] CMake failed; trying to clean and start over"; \ +- make clean; \ ++ $(MAKE) clean; \ + mkdir -p build; \ + cd build && cmake ..; \ + fi +- cd build && make $(PARALLEL_JOBS) ++ cd build && $(MAKE) $(PARALLEL_JOBS) + + install: all +- cd build && make install ++ cd build && $(MAKE) install + + # The clean target blows everything away + clean: +- -cd build && make clean ++ -cd build && $(MAKE) clean + rm -rf build + + test: all +- if cd build && make -k $@; then make test-results; else make test-results && exit 1; fi ++ if cd build && $(MAKE) -k $@; then make test-results; else $(MAKE) test-results && exit 1; fi + tests: all +- cd build && make $@ ++ cd build && $(MAKE) $@ + test-future: all +- cd build && make -k $@ ++ cd build && $(MAKE) -k $@ + gcoverage: all +- cd build && make $@ ++ cd build && $(MAKE) $@ + + #SRC = main.cpp + #LIBSRC = rospack.cpp \