Honour ${CC}

This commit is contained in:
joerg 2011-07-21 17:04:46 +00:00
parent 0c823718d1
commit eedc60742e
4 changed files with 12 additions and 14 deletions

View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2010/12/23 11:44:33 dsainty Exp $
# $NetBSD: Makefile,v 1.19 2011/07/21 17:04:46 joerg Exp $
#
DISTNAME= openrm-devel-1.5.2
@ -20,6 +20,8 @@ USE_LIBTOOL= yes
USE_TOOLS+= csh perl
REPLACE_PERL= doc/sortlist.pl doc/source2html.pl
ALL_ENV+= REAL_CC=${CC}
DOCDIR= ${PREFIX}/share/doc/OpenRM
INSTALLATION_DIRS= lib

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.8 2005/06/24 21:01:48 jlam Exp $
$NetBSD: distinfo,v 1.9 2011/07/21 17:04:46 joerg Exp $
SHA1 (openrm-devel-1.5.2.tar.gz) = 8d68099b779ea0e45361f7270ade0646e2d1e635
RMD160 (openrm-devel-1.5.2.tar.gz) = 3e0d3492b017aea2abdd3cbea0a3edd92d302023
@ -6,8 +6,8 @@ Size (openrm-devel-1.5.2.tar.gz) = 633707 bytes
SHA1 (patch-aa) = 45caa6f9d0117e98f707ba7c7e071e1f9dae4d1f
SHA1 (patch-ae) = 4ed639a1d2a91c9b2105308af5ac9a811d7e1596
SHA1 (patch-af) = 3e979fe0b9dc2e0c9f51bb91e069710779c013ed
SHA1 (patch-ag) = 1044b260c8ecbff1cd5dccad65d5431281068b68
SHA1 (patch-ah) = 3ea21d1bda163ce2291378e75aac5235cfce604a
SHA1 (patch-ag) = eedfee2b59f12c92747dee8f942194e2e9a82d08
SHA1 (patch-ah) = 7062da502784f7761bae30b093fa69ebf6124f16
SHA1 (patch-ai) = 3aeee96ee0e73f0b51e1f770f22b225bb435b58e
SHA1 (patch-aj) = 06ba3b183ba15935108bfb60bb098a71f10cc27c
SHA1 (patch-ak) = 52f05039fb635deed9dced10ec964392d9c02851

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ag,v 1.1 2005/06/23 04:02:48 jlam Exp $
$NetBSD: patch-ag,v 1.2 2011/07/21 17:04:46 joerg Exp $
--- make.cfg.orig 2004-04-18 15:55:13.000000000 -0400
+++ make.cfg
@ -8,7 +8,7 @@ $NetBSD: patch-ag,v 1.1 2005/06/23 04:02:48 jlam Exp $
+libtool:
+ @$(MAKE) $(MFLAGS) -f Makefile.x11 targets \
+ "CC = libtool --mode=compile cc" \
+ "CC = libtool --mode=compile ${CC}" \
+ "XINC = -I/usr/X11R6/include" \
+ "RMINC = ../include" \
+ "CFLAGS = $(CFLAGS) -c -DRM_X" \

View file

@ -1,13 +1,13 @@
$NetBSD: patch-ah,v 1.1 2005/06/23 04:02:48 jlam Exp $
$NetBSD: patch-ah,v 1.2 2011/07/21 17:04:46 joerg Exp $
--- /dev/null 2005-06-22 02:24:06.000000000 -0400
+++ bin/mklib.libtool 2005-06-22 02:23:35.000000000 -0400
@@ -0,0 +1,52 @@
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Make a libtool archive
+
+# $Id: patch-ah,v 1.1 2005/06/23 04:02:48 jlam Exp $
+# $Id: patch-ah,v 1.2 2011/07/21 17:04:46 joerg Exp $
+
+#--common--------------------------------------------------------------
+
@ -49,9 +49,5 @@ $NetBSD: patch-ah,v 1.1 2005/06/23 04:02:48 jlam Exp $
+
+#--platform------------------------------------------------------------
+
+# build library objects
+echo "Building libtool archive $LIBRARY.la"
+libtool --mode=clean rm -f ${LIBRARY}.la
+
+# libtool specific build
+libtool --mode=link cc ${LDFLAGS} -o ${LIBRARY}.la ${OBJECTS} ${DEPLIBS} -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}
+libtool --mode=link ${REAL_CC} ${LDFLAGS} -o ${LIBRARY}.la ${OBJECTS} ${DEPLIBS} -rpath ${PREFIX}/lib -version-info ${MAJOR}:${MINOR}