[Lunar-commits] <moonbase-other> cdrtools: build fixes

[Stefan Wold]

commit b394cd2a63f4318b2a0adfc752d2a188eca81b5a
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Sat, 18 Jan 2014 08:07:35 -0800
URL: https://github.com/lunar-linux/moonbase-other/commit/b394cd2a63f4318b2a0adfc752d2a188eca81b5a

cdrtools: build fixes

- Fixed hardcoded paths pointing to /opt/schily
- Don't install "profile" files
- Remove static libs and build dynamic libs
---
  cd/cdrtools/BUILD     | +4/-2     
  cd/cdrtools/PRE_BUILD | +13/-1    
  2 files changed, 17 insertions(+), 3 deletions(-)

--- a/cd/cdrtools/BUILD
+++ b/cd/cdrtools/BUILD
@@ -3,9 +3,11 @@ if  `module_installed smake`; then
 else
   THISMAKE=make
 fi  &&
-$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root &&
+$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root LINKMODE="dynamic" \
+  CPPOPTX="$CPPFLAGS" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" GMAKE_NOWARN="true" &&
 prepare_install                        &&
-$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man install  &&
+$THISMAKE INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root MANDIR=man  LINKMODE="dynamic" \
+  CPPOPTX="$CPPFLAGS" COPTX="$CFLAGS" LDOPTX="$LDFLAGS" GMAKE_NOWARN="true" install  &&
 
 # cdrkit compatibility:
 if [ "$COMPAT" != n ] ; then
--- a/cd/cdrtools/PRE_BUILD
+++ b/cd/cdrtools/PRE_BUILD
@@ -1,7 +1,19 @@
 default_pre_build  &&
 
+
+# Remove profiled make files
+find $SOURCE_DIRECTORY -name "*_p.mk" | xargs rm -f &&
+
+# Fix hardcoded paths
+sedit "s;opt/schily;usr;" $(find $SOURCE_DIRECTORY -type f -name \*.[0-9ch] -exec grep -l "opt/schily" "{}" "+") &&
+
+# We don't need static libaries
+sedit "s;include\t\t.*rules.lib;;" $(find $SOURCE_DIRECTORY -type f -exec grep -l "^include.\+rules\.lib" "{}" "+") &&
+
 sedit "s:/bin/rm:rm:; s:/bin/mv:mv:" RULES/rules.prg  &&
 
 # this will make it use its own headers
 # not the last linned kernel headers
-sedit "s?/usr/src/linux/include?/usr/include?g" DEFAULTS/Defaults.linux
+sedit "s;/usr/src/linux/include;;g; \
+       s;/opt/schily;/usr;g; \
+       s;bin;root;g" DEFAULTS/Defaults.linux