Revision: 25604
http://sourceforge.net/p/gar/code/25604
Author: cgrzemba
Date: 2016-03-11 11:15:14 +0000 (Fri, 11 Mar 2016)
Log Message:
-----------
xastir/trunk: remove /usr/sfw path from build env
Modified Paths:
--------------
csw/mgar/pkg/xastir/trunk/Makefile
Added Paths:
-----------
csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch
Modified: csw/mgar/pkg/xastir/trunk/Makefile
===================================================================
--- csw/mgar/pkg/xastir/trunk/Makefile 2016-03-10 13:28:40 UTC (rev 25603)
+++ csw/mgar/pkg/xastir/trunk/Makefile 2016-03-11 11:15:14 UTC (rev 25604)
@@ -14,6 +14,8 @@
# studio ignores inline statement
GARCOMPILER = GCC5
+PATCHFILES = 0001-acinclude.m4.patch
+
RUNTIME_DEP_PKGS_CSWxastir += CSWlibgdal1
RUNTIME_DEP_PKGS_CSWxastir += CSWlibintl8
RUNTIME_DEP_PKGS_CSWxastir += CSWlibpcre1
@@ -30,3 +32,9 @@
include gar/category.mk
+pre-configure:
+ cd $(WORKSRC) && aclocal-1.13 \
+ && autoconf --force \
+ && automake-1.13 -a -c -f \
+ && autoheader
+ @$(MAKECOOKIE)
Added: csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch
===================================================================
--- csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch
(rev 0)
+++ csw/mgar/pkg/xastir/trunk/files/0001-acinclude.m4.patch 2016-03-11
11:15:14 UTC (rev 25604)
@@ -0,0 +1,36 @@
+# remove sfw directories from INCLUDE and LDFLAGS
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -37,13 +37,13 @@ AC_DEFUN([XASTIR_ADD_SEARCH_PATHS],
+ [
+ AC_MSG_CHECKING([for search paths])
+
+-test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS"
+-test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS"
++# test -d /usr/local/include && CPPFLAGS="-I/usr/local/include $CPPFLAGS"
++# test -d /usr/local/lib && LDFLAGS="-L/usr/local/lib $LDFLAGS"
+
+-for d in /sw /opt /opt/local /usr/dt/share /usr/sfw /opt/sfw; do
+-test -d $d/include && CPPFLAGS="$CPPFLAGS -I$d/include"
+-test -d $d/lib && LDFLAGS="$LDFLAGS -L$d/lib"
+-done
++# for d in /sw /opt /opt/local /usr/dt/share /usr/sfw /opt/sfw; do
++# test -d $d/include && CPPFLAGS="$CPPFLAGS -I$d/include"
++# test -d $d/lib && LDFLAGS="$LDFLAGS -L$d/lib"
++# done
+
+ AC_MSG_RESULT([done])
+ ])
+@@ -161,9 +161,9 @@ AC_DEFUN([XASTIR_DETECT_BINARIES],
+ [
+ BINPATH=$PATH
+
+-for d in / /usr /usr/local /usr/X11 /usr/X11R6 /usr/sfw /opt/sfw /opt/local
/sw; do
+-test -d $d/bin && echo $BINPATH | grep -- $d/bin > /dev/null ||
BINPATH="$BINPATH:$d/bin"
+-done
++# for d in / /usr /usr/local /usr/X11 /usr/X11R6 /usr/sfw /opt/sfw /opt/local
/sw; do
++# test -d $d/bin && echo $BINPATH | grep -- $d/bin > /dev/null ||
BINPATH="$BINPATH:$d/bin"
++# done
+
+ # it would be much nicer to do this in a for loop
+
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
