diff options
| author |   Ryan Hill <dirtyepic@gentoo.org> | 2009-08-13 04:40:31 +0000 |
|---|---|---|
| committer | Ryan Hill <dirtyepic@gentoo.org> | 2009-08-13 04:40:31 +0000 |
| commit | b7446e3ba9d325ffd3ca099d558156ab8bc4f3f1 (patch) | |
| tree | fe6778bcd30470b7c19c55d329d0ef7a1b44f7e8 /dev-util/ftjam/files | |
| parent | Version bump. (diff) | |
| download | gentoo-2-b7446e3ba9d325ffd3ca099d558156ab8bc4f3f1.tar.gz gentoo-2-b7446e3ba9d325ffd3ca099d558156ab8bc4f3f1.tar.bz2 gentoo-2-b7446e3ba9d325ffd3ca099d558156ab8bc4f3f1.zip | |
Revision bump. Respect CC (bug #244002), CFLAGS (bug #240276), and LDFLAGS
(bug #281210) for the jam part of the build.
(Portage version: 2.2_rc38/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/ftjam/files')
| -rw-r--r-- | dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch | 14 | ||||
| -rw-r--r-- | dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch | 59 |
2 files changed, 73 insertions, 0 deletions
diff --git a/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch new file mode 100644 index 000000000000..ba6613430308 --- /dev/null +++ b/dev-util/ftjam/files/ftjam-2.5.3-debug-commandline.patch @@ -0,0 +1,14 @@ +Make jam print the commandline it's executing. +Only useful for ebuild debugging - I just always forget how to enable it. + +--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in ++++ ftjam-2.5.3rc2/builds/unix/Makefile.in +@@ -16,7 +16,7 @@ + + all: jam0 + chmod a+w jambase.c +- ./jam0 ++ ./jam0 -dx -q + + include common.mk + diff --git a/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch new file mode 100644 index 000000000000..1b33a0f770d3 --- /dev/null +++ b/dev-util/ftjam/files/ftjam-2.5.3-false-flags.patch @@ -0,0 +1,59 @@ +Respect CC, *FLAGS. Add datarootdir for autoconf-2.60 warnings. + +--- ftjam-2.5.3rc2-orig/builds/unix/Makefile.in ++++ ftjam-2.5.3rc2/builds/unix/Makefile.in +@@ -37,6 +37,7 @@ exec_prefix := @exec_prefix@ + libdir := @libdir@ + bindir := @bindir@ + includedir := @includedir@ ++datarootdir := @datarootdir@ + datadir := @datadir@ + + version_info := @version_info@ +--- ftjam-2.5.3rc2-orig/jambase.c ++++ ftjam-2.5.3rc2/jambase.c +@@ -652,21 +652,21 @@ const char *jambase[] = { + "\n", + "AR ?= ar ru ;\n", + "AS ?= as ;\n", +-"ASFLAGS ?= ;\n", ++"ASFLAGS += $(ASFLAGS) ;\n", + "AWK ?= awk ;\n", + "BINDIR ?= /usr/local/bin ;\n", +-"C++ ?= cc ;\n", +-"C++FLAGS ?= ;\n", +-"CC ?= cc ;\n", +-"CCFLAGS ?= ;\n", ++"C++ ?= $(CXX) ;\n", ++"C++FLAGS += $(CXXFLAGS) ;\n", ++"CC ?= $(CC) ;\n", ++"CCFLAGS += $(CFLAGS) ;\n", + "CP ?= cp -f ;\n", + "CRELIB ?= ;\n", + "DOT ?= . ;\n", + "DOTDOT ?= .. ;\n", + "EXEMODE ?= 711 ;\n", + "FILEMODE ?= 644 ;\n", +-"FORTRAN ?= f77 ;\n", +-"FORTRANFLAGS ?= ;\n", ++"FORTRAN ?= $(F77) ;\n", ++"FORTRANFLAGS += $(FFLAGS) ;\n", + "HDRS ?= ;\n", + "INSTALLGRIST ?= installed ;\n", + "JAMFILE ?= Jamfile ;\n", +@@ -674,13 +674,13 @@ const char *jambase[] = { + "LEX ?= ;\n", + "LIBDIR ?= /usr/local/lib ;\n", + "LINK ?= $(CC) ;\n", +-"LINKFLAGS ?= ;\n", ++"LINKFLAGS += $(LDFLAGS) ;\n", + "LINKLIBS ?= ;\n", + "LN ?= ln ;\n", + "MANDIR ?= /usr/local/man ;\n", + "MKDIR ?= mkdir ;\n", + "MV ?= mv -f ;\n", +-"OPTIM ?= ;\n", ++"OPTIM = ;\n", + "RCP ?= rcp ;\n", + "RM ?= rm -f ;\n", + "RMDIR ?= $(RM) ;\n", |