From 651e35f1f12e2cd4d535c6e18922b26d9261cce4 Mon Sep 17 00:00:00 2001 From: alibrary Date: Mon, 20 Dec 2004 04:40:03 +0000 Subject: [PATCH] Mods for MacOSX --- ALIROOT/binaliroot.pkg | 15 +++++++++++---- MONITOR/binmonitorCheck.pkg | 8 ++++++++ MONITOR/binmonitorGDC.pkg | 8 ++++++++ RAW/binalimdc.pkg | 3 +++ build/Makefile.macosx | 32 -------------------------------- build/clean.tpl | 1 + build/header.tpl | 1 + build/module.tpl | 10 ++++++++-- 8 files changed, 40 insertions(+), 38 deletions(-) diff --git a/ALIROOT/binaliroot.pkg b/ALIROOT/binaliroot.pkg index d661960aac8..4065f8b5101 100644 --- a/ALIROOT/binaliroot.pkg +++ b/ALIROOT/binaliroot.pkg @@ -1,3 +1,5 @@ +#-*- Mode: Makefile -*- + SRCS:=aliroot.cxx CSRCS:=fpu.c @@ -15,8 +17,17 @@ ELIBS:= MUONgeometry MUONrec MUONsim MUONbase MUONmapping \ TPHIC FASTSIM microcern RAW AliL3Src AliL3Comp AliL3Misc AliL3Hough ifeq (macosx,$(ALICE_TARGET)) + +@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS)) +@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT)) +@PACKAGE@LIBSINIT:=$(filter-out mevsim,$(@PACKAGE@LIBSINIT)) +@PACKAGE@LIBSINIT:=$(filter-out HBTP,$(@PACKAGE@LIBSINIT)) +@PACKAGE@LIBSINIT:=$(filter-out herwig,$(@PACKAGE@LIBSINIT)) +@PACKAGE@LIBSINIT:=$(filter-out EPEMGEN,$(@PACKAGE@LIBSINIT)) +PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%) # On Mac OS X gcc we need g2c ELIBS+=g2c + endif # The two variables below are used for the creation of profile target. @@ -77,7 +88,3 @@ ARLIBS:= \ SHLIBS:= $(BINLIBDIRS) -lEVGEN -lpythia6 -lAliPythia6 -lpdf -lTHijing -lhijing -lTMEVSIM -lmevsim -lTHbtp -lHBTP -lTHerwig -lherwig -lTEPEMGEN -lEPEMGEN -lTPHIC -lFASTSIM -lmicrocern -ifeq (macosx,$(ALICE_TARGET)) -# On Mac OS X gcc we need g2c -SHLIBS+=-lg2c -endif diff --git a/MONITOR/binmonitorCheck.pkg b/MONITOR/binmonitorCheck.pkg index fab99a170ad..715722dccc4 100644 --- a/MONITOR/binmonitorCheck.pkg +++ b/MONITOR/binmonitorCheck.pkg @@ -24,3 +24,11 @@ else ELIBS:= pythia6 pdf microcern endif + +ifeq (macosx,$(ALICE_TARGET)) +@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS)) +@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT)) +PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%) +# On Mac OS X gcc we need g2c +ELIBS+=g2c +endif diff --git a/MONITOR/binmonitorGDC.pkg b/MONITOR/binmonitorGDC.pkg index 651973804e9..a97460c0f98 100644 --- a/MONITOR/binmonitorGDC.pkg +++ b/MONITOR/binmonitorGDC.pkg @@ -24,3 +24,11 @@ else ELIBS:= pythia6 pdf microcern endif + +ifeq (macosx,$(ALICE_TARGET)) +@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS)) +@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT)) +PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%) +# On Mac OS X gcc we need g2c +ELIBS+=g2c +endif diff --git a/RAW/binalimdc.pkg b/RAW/binalimdc.pkg index b0bbcffdd03..49d9fc0d549 100644 --- a/RAW/binalimdc.pkg +++ b/RAW/binalimdc.pkg @@ -24,6 +24,9 @@ ELIBS:=ESD RAW MDC STEER TPCbase TPCsim TPCrec CONTAINERS AliL3Src AliL3Misc Ali #ifneq (,$(findstring macosx,$(ALICE_TARGET))) ifeq (macosx,$(ALICE_TARGET)) +@PACKAGE@LIBSINIT:=$(filter-out microcern,$(ELIBS)) +@PACKAGE@LIBSINIT:=$(filter-out pdf,$(@PACKAGE@LIBSINIT)) +PACKLDFLAGS:=$(LDFLAGS) $(@PACKAGE@LIBSINIT:%=-Wl,-u,_G__cpp_setupG__%) # On Mac OS X gcc we need g2c ELIBS+=g2c endif diff --git a/build/Makefile.macosx b/build/Makefile.macosx index 2d6cb647744..28bcfe60dc1 100644 --- a/build/Makefile.macosx +++ b/build/Makefile.macosx @@ -31,38 +31,6 @@ DEPENDFFLAGS = $(FFLAGS) # rootcint flags CINTFLAGS = -DICTNOLOAD:= - -DICTLOAD:= -Wl,-u,_G__cpp_setupG__AliL3Comp -Wl,-u,_G__cpp_setupG__AliL3Hough \ --Wl,-u,_G__cpp_setupG__AliL3Misc -Wl,-u,_G__cpp_setupG__AliL3Src \ --Wl,-u,_G__cpp_setupG__AliPythia6 -Wl,-u,_G__cpp_setupG__CONTAINERS \ --Wl,-u,_G__cpp_setupG__CRT -Wl,-u,_G__cpp_setupG__EMCAL \ --Wl,-u,_G__cpp_setupG__ESD -Wl,-u,_G__cpp_setupG__EVGEN \ --Wl,-u,_G__cpp_setupG__FASTSIM -Wl,-u,_G__cpp_setupG__FMDbase \ --Wl,-u,_G__cpp_setupG__FMDrec -Wl,-u,_G__cpp_setupG__FMDsim \ --Wl,-u,_G__cpp_setupG__ITS -Wl,-u,_G__cpp_setupG__MUONbase \ --Wl,-u,_G__cpp_setupG__MUONgeometry -Wl,-u,_G__cpp_setupG__MUONmapping \ --Wl,-u,_G__cpp_setupG__MUONrec -Wl,-u,_G__cpp_setupG__MUONsim \ --Wl,-u,_G__cpp_setupG__PHOS -Wl,-u,_G__cpp_setupG__PMDbase \ --Wl,-u,_G__cpp_setupG__PMDrec -Wl,-u,_G__cpp_setupG__PMDsim \ --Wl,-u,_G__cpp_setupG__RAW -Wl,-u,_G__cpp_setupG__RICH \ --Wl,-u,_G__cpp_setupG__STARTbase -Wl,-u,_G__cpp_setupG__STARTrec \ --Wl,-u,_G__cpp_setupG__STARTsim -Wl,-u,_G__cpp_setupG__STEER \ --Wl,-u,_G__cpp_setupG__STRUCT -Wl,-u,_G__cpp_setupG__TEPEMGEN \ --Wl,-u,_G__cpp_setupG__THbtp -Wl,-u,_G__cpp_setupG__THerwig \ --Wl,-u,_G__cpp_setupG__THijing -Wl,-u,_G__cpp_setupG__TMEVSIM \ --Wl,-u,_G__cpp_setupG__TOFbase -Wl,-u,_G__cpp_setupG__TOFrec \ --Wl,-u,_G__cpp_setupG__TOFsim -Wl,-u,_G__cpp_setupG__TPCbase \ --Wl,-u,_G__cpp_setupG__TPCfast -Wl,-u,_G__cpp_setupG__TPCrec \ --Wl,-u,_G__cpp_setupG__TPCsim -Wl,-u,_G__cpp_setupG__TPHIC \ --Wl,-u,_G__cpp_setupG__TRDbase -Wl,-u,_G__cpp_setupG__TRDfast \ --Wl,-u,_G__cpp_setupG__TRDrec -Wl,-u,_G__cpp_setupG__TRDsim \ --Wl,-u,_G__cpp_setupG__VZERObase -Wl,-u,_G__cpp_setupG__VZEROrec \ --Wl,-u,_G__cpp_setupG__VZEROsim \ --Wl,-u,_G__cpp_setupG__ZDCbase -Wl,-u,_G__cpp_setupG__ZDCrec \ --Wl,-u,_G__cpp_setupG__ZDCsim -Wl,-u,_G__cpp_setupG__hijing \ --Wl,-u,_G__cpp_setupG__pythia6 - LD = export MACOSX_DEPLOYMENT_TARGET=10.3 ; \ unset LD_PREBIND ; \ g++ diff --git a/build/clean.tpl b/build/clean.tpl index a88760b4689..355d1f863da 100644 --- a/build/clean.tpl +++ b/build/clean.tpl @@ -1,3 +1,4 @@ +#-*- Mode: Makefile -*- # Clean option for the whole module clean-@MODULE@: diff --git a/build/header.tpl b/build/header.tpl index b0c50bad88c..c2dae5c0c43 100644 --- a/build/header.tpl +++ b/build/header.tpl @@ -27,6 +27,7 @@ PACKCXXFLAGS:= PACKCFLAGS:= PACKDYFLAGS:= PACKSOFLAGS:= +PACKLDFLAGS:= EXPORT:= EHDRS:= CINTHDRS:= diff --git a/build/module.tpl b/build/module.tpl index 0d410b22256..27ec7ec5716 100644 --- a/build/module.tpl +++ b/build/module.tpl @@ -33,6 +33,12 @@ else endif endif +ifndef PACKLDFLAGS +@PACKAGE@LDFLAGS:=$(LDFLAGS) +else +@PACKAGE@LDFLAGS:=$(PACKLDFLAGS) +endif + ifndef PACKDCXXFLAGS @PACKAGE@DCXXFLAGS:=$(CXXFLAGSNO) else @@ -227,9 +233,9 @@ ifndef ALIQUIET @echo "***** Making executable $@ *****" endif ifeq ($(ALIPROFILE),YES) - $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@ + $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(ARLIBS) $(SHLIBS) $(LIBS) $(EXEFLAGS) -o $@ else - $(MUTE)$(LD) $(LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@ + $(MUTE)$(LD) $(@PACKAGE@LDFLAGS) $(@PACKAGE@O) $(@PACKAGE@DO) $(BINLIBDIRS) $(@PACKAGE@ELIBSDIR) $(@PACKAGE@ELIBS) $(LIBS) $(EXEFLAGS) -o $@ endif $(@PACKAGE@DS): $(@PACKAGE@CINTHDRS) $(@PACKAGE@DH) @MODULE@/module.mk -- 2.31.1