svn commit: r335942 - head/devel/ros/files

John Marino marino at FreeBSD.org
Sun Dec 8 21:13:56 UTC 2013


Author: marino
Date: Sun Dec  8 21:13:56 2013
New Revision: 335942
URL: http://svnweb.freebsd.org/changeset/ports/335942

Log:
  devel/ros: Properly support specified gmake
  
  This port needs gmake, but "make" was hardcoded.
  This fix unbreaks it on head where bmake is default.

Added:
  head/devel/ros/files/patch-tools_rospack_Makefile   (contents, props changed)

Added: head/devel/ros/files/patch-tools_rospack_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/ros/files/patch-tools_rospack_Makefile	Sun Dec  8 21:13:56 2013	(r335942)
@@ -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 \


More information about the svn-ports-all mailing list