diff options
| author | johans <johans@FreeBSD.org> | 2011-07-26 03:40:47 +0800 |
|---|---|---|
| committer | johans <johans@FreeBSD.org> | 2011-07-26 03:40:47 +0800 |
| commit | 62f88d3ba9135249c5cc0a6bb1d072ec901c00fa (patch) | |
| tree | bc34411d690103b2029c75a5a485edde5c40a199 /lang | |
| parent | 4a7a0522fed5ce5a39bae23ddcd586380c4ecc9e (diff) | |
| download | freebsd-ports-gnome-62f88d3ba9135249c5cc0a6bb1d072ec901c00fa.tar.gz freebsd-ports-gnome-62f88d3ba9135249c5cc0a6bb1d072ec901c00fa.tar.zst freebsd-ports-gnome-62f88d3ba9135249c5cc0a6bb1d072ec901c00fa.zip | |
- Respect $CC
- Fix build with clang
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/moscow_ml/files/patch-Makefile.inc | 3 | ||||
| -rw-r--r-- | lang/moscow_ml/files/patch-config::auto_aux::hasgot | 13 | ||||
| -rw-r--r-- | lang/moscow_ml/files/patch-runtime::Makefile | 11 |
3 files changed, 26 insertions, 1 deletions
diff --git a/lang/moscow_ml/files/patch-Makefile.inc b/lang/moscow_ml/files/patch-Makefile.inc index 597682bfde17..6385816adf1c 100644 --- a/lang/moscow_ml/files/patch-Makefile.inc +++ b/lang/moscow_ml/files/patch-Makefile.inc @@ -18,7 +18,7 @@ ADDRUNCFLAGS= ADDDYNLIBCFLAGS= -@@ -45,13 +45,13 @@ +@@ -45,13 +45,14 @@ # For NetBSD, use: # ------------------------ @@ -36,6 +36,7 @@ +INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} +INSTALL_SCRIPT=${BSD_INSTALL_SCRIPT} +INSTALL_DATA=${BSD_INSTALL_DATA} ++LD=${CC} -rdynamic # For Solaris 2 (not SunOS 4), use: # --------------------------------- diff --git a/lang/moscow_ml/files/patch-config::auto_aux::hasgot b/lang/moscow_ml/files/patch-config::auto_aux::hasgot new file mode 100644 index 000000000000..496e137b5f6e --- /dev/null +++ b/lang/moscow_ml/files/patch-config::auto_aux::hasgot @@ -0,0 +1,13 @@ +--- config/auto-aux/hasgot.orig 2011-07-25 21:36:30.000000000 +0200 ++++ config/auto-aux/hasgot 2011-07-25 21:36:36.000000000 +0200 +@@ -1,5 +1,7 @@ + #!/bin/sh +-(echo "main() {" ++( ++ for f in $*; do echo "extern void $f(void);"; done ++ echo "int main() {" + for f in $*; do echo " $f();"; done +- echo "}") > hasgot.c +-exec $cc -o tst hasgot.c > /dev/null 2>/dev/null ++ echo "return 0; }") > hasgot.c ++exec $cc -o tst hasgot.c diff --git a/lang/moscow_ml/files/patch-runtime::Makefile b/lang/moscow_ml/files/patch-runtime::Makefile index 1d05c283b559..a52bf07ea01f 100644 --- a/lang/moscow_ml/files/patch-runtime::Makefile +++ b/lang/moscow_ml/files/patch-runtime::Makefile @@ -9,3 +9,14 @@ primitives : $(PRIMS) sed -n -e '/\/\* ML \*\//s/.* \([a-zA-Z0-9_][a-zA-Z0-9_]*\) *(.*/\1/p' \ +@@ -87,8 +87,8 @@ + depend : prims.c opnames.h jumptbl.h + mv Makefile Makefile.bak + (sed -n -e '1,/^### DO NOT DELETE THIS LINE/p' Makefile.bak; \ +- gcc -MM -I.. $(OPTS) *.c; \ +- gcc -MM -I.. $(OPTS) -DDEBUG *.c | sed -e 's/\.o/.d.o/') > Makefile ++ $(CC) -MM -I.. $(OPTS) *.c; \ ++ $(CC) -MM -I.. $(OPTS) -DDEBUG *.c | sed -e 's/\.o/.d.o/') > Makefile + rm Makefile.bak + + ### EVERYTHING THAT GOES BEYOND THIS COMMENT WILL BE ERASED WITHOUT WARNING |