mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-02 23:48:17 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
60 lines
1.6 KiB
Diff
60 lines
1.6 KiB
Diff
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",
|