cint: Fix linking of runtime

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Sep 27 22:38:57 2016 +0200
Changeset:	8fcf3e84d415fd0099130fc1140d87711d15fe4e

Modified Files:
	cint/Makefile
	cint/distinfo
	cint/patches/patch-configure

Log Message:
cint: Fix linking of runtime

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8fcf3e84d415fd0099130fc1140d87711d15fe4e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cint/Makefile                | 10 +++++++++-
 cint/distinfo                |  2 +-
 cint/patches/patch-configure | 31 +++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diffs:
diff --git a/cint/Makefile b/cint/Makefile
index 0d93a62..058e401 100644
--- a/cint/Makefile
+++ b/cint/Makefile
@@ -25,10 +25,18 @@ USE_LANGUAGES=		c c++
 HAS_CONFIGURE=			yes
 BUILDLINK_TRANSFORM.NetBSD+=	rm:-ldl
 # It does not work
-CPPFLAGS+=			-Wno-write-strings
+CFLAGS+=			-Wno-write-strings
+CXXFLAGS+=			-Wno-write-strings
 # For some reason I cannot get BUILDLINK path for .readline
 LDFLAGS+=			${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS+=			${COMPILER_RPATH_FLAG}${PREFIX}/cint/lib
+CONFIGURE_ENV+=			CFLAGS_ADD=${CFLAGS:Q}
+CONFIGURE_ENV+=			CXXFLAGS_ADD=${CXXFLAGS:Q}
+CONFIGURE_ENV+=			LDFLAGS_ADD=${LDFLAGS:Q}
+CONFIGURE_ENV+=			SOFLAGS_ADD=${LDFLAGS:Q}
+
+BUILDLINK_PASSTHRU_DIRS+=	${PREFIX}/cint/lib
+BUILDLINK_PASSTHRU_RPATHDIRS+=  ${PREFIX}/cint/lib
 
 BUILD_TARGET=			# empty string required
 
diff --git a/cint/distinfo b/cint/distinfo
index 07ba692..74eaddf 100644
--- a/cint/distinfo
+++ b/cint/distinfo
@@ -5,7 +5,7 @@ RMD160 (cint-5.16.19-source.tar.gz) = ff7deb0cdf5534fb8849eaf5febf9e57117066ff
 SHA512 (cint-5.16.19-source.tar.gz) = ae96247dc62f7ab27d514b302cd836a9bed07ed24adc664224c063a70e1305a335e01031e0dd18646d3d7215593590a8d5100c4236aba08064bbcf0ece531c02
 Size (cint-5.16.19-source.tar.gz) = 1975329 bytes
 SHA1 (patch-Makefile) = 2bbed612d93d5a86a0e331d40d8be029d50e93a0
-SHA1 (patch-configure) = d6a523c22f1a4ee5a96c06fbd87f8cefed30cfdc
+SHA1 (patch-configure) = 281dd6f18d1d9528e0c993175ef32571c49e6ea8
 SHA1 (patch-src_Method.cxx) = ee84d79c15f6951c07527e8c000c0d8eb60fdc71
 SHA1 (patch-src_bc__reader.h) = f768471d096a7e9401f7322f960119dd0f92769b
 SHA1 (patch-src_gcc3strm.cxx) = d0003a4fbfbe85080eb1770376c2bcaec562fdb8
diff --git a/cint/patches/patch-configure b/cint/patches/patch-configure
index df394e7..4c7a93e 100644
--- a/cint/patches/patch-configure
+++ b/cint/patches/patch-configure
@@ -74,3 +74,34 @@ Fix readlinelib parameter handling.
      READLINELIB=$1
      BUILDREADLINE=
  }
+@@ -461,17 +471,22 @@ if [ "$ARCH" = "" ]; then
+ fi
+ 
+ if [ "$DEBUG" = "1" ]; then
+-    LDFLAGS="$LDDBGFLAGS $LDFLAGS"
+-    SOFLAGS="$SODBGFLAGS $SOFLAGS"
+-    CFLAGS="$CDBGFLAGS $CFLAGS"
+-    CXXFLAGS="$CXXDBGFLAGS $CXXFLAGS"
++    LDFLAGS="$LDDBGFLAGS $LDFLAGS $LDFLAGS_ADD"
++    SOFLAGS="$SODBGFLAGS $SOFLAGS $SOFLAGS_ADD"
++    CFLAGS="$CDBGFLAGS $CFLAGS $CFLAGS_ADD"
++    CXXFLAGS="$CXXDBGFLAGS $CXXFLAGS $CXXFLAGS_ADD"
+ else
+-    LDFLAGS="$LDOPTFLAGS $LDFLAGS"
+-    SOFLAGS="$SOOPTFLAGS $SOFLAGS"
+-    CFLAGS="$COPTFLAGS $CFLAGS"
+-    CXXFLAGS="$CXXOPTFLAGS $CXXFLAGS"
++    LDFLAGS="$LDOPTFLAGS $LDFLAGS $LDFLAGS_ADD"
++    SOFLAGS="$SOOPTFLAGS $SOFLAGS $SOFLAGS_ADD"
++    CFLAGS="$COPTFLAGS $CFLAGS $CFLAGS_ADD"
++    CXXFLAGS="$CXXOPTFLAGS $CXXFLAGS $CXXFLAGS_ADD"
+ fi
+ 
++echo LDFLAGS=$LDFLAGS
++echo SOFLAGS=$SOFLAGS
++echo CFLAGS=$CFLAGS
++echo CXXFLAGS=$CXXFLAGS
++
+ CMACROS="$CMACROS -DG__HAVE_CONFIG -DG__NOMAKEINFO"
+ CXXMACROS="$CXXMACROS -DG__HAVE_CONFIG -DG__NOMAKEINFO"
+