diff options
| author |   Daniel Drake <dsd@gentoo.org> | 2007-02-08 17:15:40 +0000 |
|---|---|---|
| committer | Daniel Drake <dsd@gentoo.org> | 2007-02-08 17:15:40 +0000 |
| commit | 9ea67bdeb31a2d72ce925c0e7e61e2c0948dce0c (patch) | |
| tree | aeb03d76faeaa0936632a60beee7fbb7e5e85b32 /dev-util/acgmake | |
| parent | Add dev profile files. (diff) | |
| download | historical-9ea67bdeb31a2d72ce925c0e7e61e2c0948dce0c.tar.gz historical-9ea67bdeb31a2d72ce925c0e7e61e2c0948dce0c.tar.bz2 historical-9ea67bdeb31a2d72ce925c0e7e61e2c0948dce0c.zip | |
add missing patch
Package-Manager: portage-2.1.2-r9
Diffstat (limited to 'dev-util/acgmake')
| -rw-r--r-- | dev-util/acgmake/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/acgmake/files/acgmake-1.2-cflags.patch | 66 |
2 files changed, 70 insertions, 0 deletions
diff --git a/dev-util/acgmake/Manifest b/dev-util/acgmake/Manifest index d19c49c8406d..d4c327d034aa 100644 --- a/dev-util/acgmake/Manifest +++ b/dev-util/acgmake/Manifest @@ -1,3 +1,7 @@ +AUX acgmake-1.2-cflags.patch 1882 RMD160 88a6241b92313bf3c6f50266969ccea8c93e12ff SHA1 49e67410d8ee1df700e36453cdaa32e9cab9fe6b SHA256 333406f809cfe375360734765e13cd16ea21c882048bc511fc955e8455e6c583 +MD5 47a3905e0be5c5863286a3244cde1860 files/acgmake-1.2-cflags.patch 1882 +RMD160 88a6241b92313bf3c6f50266969ccea8c93e12ff files/acgmake-1.2-cflags.patch 1882 +SHA256 333406f809cfe375360734765e13cd16ea21c882048bc511fc955e8455e6c583 files/acgmake-1.2-cflags.patch 1882 DIST acgmake-1.2.tgz 60894 RMD160 3803fe5694451b6da5111e20e71fad6e377eeeb7 SHA1 df36d2a7a63c950b893fc89f3adf165524ed0284 SHA256 6da22b8cc63c24ada430ca3120357cff774f1348f11d892956dba49cc9d680e8 EBUILD acgmake-1.2-r1.ebuild 918 RMD160 e94626d6eac2f4e9d5c1e78dea0b2530fec7cd70 SHA1 2b55f768e7430cfd01f2ee3e2ebe1535bedf4332 SHA256 6d70e8dbb573c2e72a5e33786e553138e4488cac49f14f9ae2be80578b950d61 MD5 2c433a543c018b949bcc870778876caf acgmake-1.2-r1.ebuild 918 diff --git a/dev-util/acgmake/files/acgmake-1.2-cflags.patch b/dev-util/acgmake/files/acgmake-1.2-cflags.patch new file mode 100644 index 000000000000..383b85d4103c --- /dev/null +++ b/dev-util/acgmake/files/acgmake-1.2-cflags.patch @@ -0,0 +1,66 @@ + +From: Daniel Drake <d.drake@mmm.com> + +Allow build flags to be pulled from the environment, and make this the default +behaviour (but fall back on old defaults if environment is empty). + +Index: acgmake/bin/acgmake +=================================================================== +--- acgmake.orig/bin/acgmake ++++ acgmake/bin/acgmake +@@ -68,7 +68,7 @@ done + + + # parse options +-CODE_LEVEL=dbg ++CODE_LEVEL=default + LIB_TYPE=shared + HIDE="@" + JOBS="" +@@ -79,6 +79,7 @@ for i in $OPTIONS ; do + + + # compilation options ++ -env ) CODE_LEVEL=env ;; + -dbg ) CODE_LEVEL=dbg ;; + -prf ) CODE_LEVEL=prf ;; + -opt ) CODE_LEVEL=opt ;; +@@ -174,6 +175,13 @@ if [ $? != 0 ] ; then + fi + ARCH=`$ACGMAKE/bin/arch.sh` + ++# if no compiler options were specified, attempt to pull cflags out of ++# environment, and fallback on dbg if none were specified ++if [ "$CODE_LEVEL" == "default" -a -z "$CXXFLAGS" -a -z "$CXXDEFS" -a -z "$LDFLAGS" ]; then ++ CODE_LEVEL="dbg" ++else ++ CODE_LEVEL="env" ++fi + + + # collect options +Index: acgmake/modules/cxx_include +=================================================================== +--- acgmake.orig/modules/cxx_include ++++ acgmake/modules/cxx_include +@@ -153,9 +153,17 @@ ifneq ($(PACKAGES),) + endif + + +-CXX_DEFS += $(CXX_DEFS_$(call uppercase,$(CODE_LEVEL))) +-CXX_CFLAGS += $(CXX_CFLAGS_$(call uppercase,$(CODE_LEVEL))) +-CXX_LDFLAGS += $(CXX_LDFLAGS_$(call uppercase,$(CODE_LEVEL))) ++ifeq ($(CODE_LEVEL),env) ++ # these come from the environment ++ CXX_DEFS += $(CXXDEFS) ++ CXX_CFLAGS += $(CXXFLAGS) ++ CXX_LDFLAGS += $(LDFLAGS) ++else ++ CXX_DEFS += $(CXX_DEFS_$(call uppercase,$(CODE_LEVEL))) ++ CXX_CFLAGS += $(CXX_CFLAGS_$(call uppercase,$(CODE_LEVEL))) ++ CXX_LDFLAGS += $(CXX_LDFLAGS_$(call uppercase,$(CODE_LEVEL))) ++endif ++ + CXX_CFLAGS += $(CXX_DEFS) + CXX_CFLAGS += $(cxx-cflags) + CXX_CFLAGS += $(cxx-incpath) |