From 6a77251502902b631190d50983fa375085b4ddc3 Mon Sep 17 00:00:00 2001 From: hristov Date: Fri, 28 Oct 2005 16:38:02 +0000 Subject: [PATCH] System dependent xargs --- build/Makefile.alphacxx6 | 4 ++++ build/Makefile.hpuxacc | 4 ++++ build/Makefile.linux | 4 ++++ build/Makefile.linuxia64ecc | 6 +++++- build/Makefile.linuxia64gcc | 4 ++++ build/Makefile.linuxicc | 4 ++++ build/Makefile.linuxx8664gcc | 4 ++++ build/module.tpl | 6 +++--- 8 files changed, 32 insertions(+), 4 deletions(-) diff --git a/build/Makefile.alphacxx6 b/build/Makefile.alphacxx6 index 9c03828da09..51ab60a5de5 100644 --- a/build/Makefile.alphacxx6 +++ b/build/Makefile.alphacxx6 @@ -1,5 +1,9 @@ # Makefile to build AliRoot for Alpha OSF1 +# System dependent commands + +XARGS = xargs + # The compilers CXX = cxx F77 = f77 diff --git a/build/Makefile.hpuxacc b/build/Makefile.hpuxacc index 5d59e82c55c..f53fbf95c89 100644 --- a/build/Makefile.hpuxacc +++ b/build/Makefile.hpuxacc @@ -1,5 +1,9 @@ # Makefile to build AliRoot on HP-UX +# System dependent commands + +XARGS = xargs + # The compilers CXX = aCC F77 = f77 diff --git a/build/Makefile.linux b/build/Makefile.linux index f8876c797e8..a16f5d9df85 100644 --- a/build/Makefile.linux +++ b/build/Makefile.linux @@ -1,5 +1,9 @@ # Makefile to build AliRoot for Linux +# System dependent commands + +XARGS = xargs -r + # The compilers CXX = g++ F77 = g77 diff --git a/build/Makefile.linuxia64ecc b/build/Makefile.linuxia64ecc index d66e339d369..617fedf7b80 100644 --- a/build/Makefile.linuxia64ecc +++ b/build/Makefile.linuxia64ecc @@ -1,5 +1,9 @@ # Makefile for AliRoot for Itanium/Linux with Intel icc compiler +# System dependent commands + +XARGS = xargs -r + # The compilers CXX = icc F77 = ifort @@ -49,4 +53,4 @@ AEXT = a LIBNOVER = `find /lib -name 'libNoVersion*.so' | xargs --replace basename {} .so | sed -e 's/lib/ -l/'` SYSLIBS := $(LIBNOVER) -lcrypt -L/usr/local/lib -lXt -lCEPCF90 -lF90 \ - -lPEPCF90 -lintrins -L/usr/X11R6/lib -lX11 \ No newline at end of file + -lPEPCF90 -lintrins -L/usr/X11R6/lib -lX11 diff --git a/build/Makefile.linuxia64gcc b/build/Makefile.linuxia64gcc index aff5c8026ec..2834d878433 100644 --- a/build/Makefile.linuxia64gcc +++ b/build/Makefile.linuxia64gcc @@ -1,5 +1,9 @@ # Makefile for AliRoot for Itanium/Linux with gcc +# System dependent commands + +XARGS = xargs -r + # The compilers CXX = g++ F77 = g77 diff --git a/build/Makefile.linuxicc b/build/Makefile.linuxicc index ec2143bd7eb..c47ba493c7b 100644 --- a/build/Makefile.linuxicc +++ b/build/Makefile.linuxicc @@ -1,5 +1,9 @@ # Makefile for AliRoot for Linux with the Intel icc compiler +# System dependent commands + +XARGS = xargs -r + # The compilers CXX = icc CC = icc diff --git a/build/Makefile.linuxx8664gcc b/build/Makefile.linuxx8664gcc index 1a75a76cbb3..55acc2b5733 100644 --- a/build/Makefile.linuxx8664gcc +++ b/build/Makefile.linuxx8664gcc @@ -1,5 +1,9 @@ # Makefile for AliRoot for Itanium/Linux with gcc +# System dependent commands + +XARGS = xargs -r + # The compilers CXX = g++ F77 = g77 diff --git a/build/module.tpl b/build/module.tpl index aef3a639f99..8ce031036af 100644 --- a/build/module.tpl +++ b/build/module.tpl @@ -267,9 +267,9 @@ endif $(MODDIRO)/@PACKAGE@_srcslist: @MODULE@/@TYPE@@PACKAGE@.pkg $(MUTE)if [ ! -d '$(dir $@)' ]; then echo "***** Making directory $(dir $@) *****"; mkdir -p $(dir $@); fi $(MUTE)for i in $(@PACKAGE@CS) $(@PACKAGE@S) xyz; do echo $$i; done | sort > $@.new - $(MUTE)for j in `diff -w $@ $@.new 2>/dev/null | awk '/^\/dev/null | awk '/^\/dev/null 2>&1 $@ $@.new ;\ if [ $$? -ne 0 ]; then \mv $@.new $@; else \rm $@.new; fi -- 2.43.0