Hi, Here is a patch to remove the unxfbsdi.mk and unxfbsx.mk, using a single unxfbsd.mk highly simplified regards, Bapt
From 70bde1db2e0e1b2f183b12d99dd2f9e1fa20ee1c Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin <bapt@FreeBSD.org> Date: Mon, 19 Sep 2011 13:47:21 +0200 Subject: [PATCH 2/2] unify the unxfbsd.mk into a single file and simplify it --- solenv/inc/unxfbsd.mk | 173 +++--------------------------------------------- solenv/inc/unxfbsdi.mk | 43 ------------ solenv/inc/unxfbsdx.mk | 47 ------------- 3 files changed, 9 insertions(+), 254 deletions(-) delete mode 100644 solenv/inc/unxfbsdi.mk delete mode 100644 solenv/inc/unxfbsdx.mk diff --git a/solenv/inc/unxfbsd.mk b/solenv/inc/unxfbsd.mk index f751384..3826b35 100644 --- a/solenv/inc/unxfbsd.mk +++ b/solenv/inc/unxfbsd.mk @@ -27,178 +27,23 @@ # Makefile for FreeBSD. -ASM= -AFLAGS= - -SOLAR_JAVA*= -JAVAFLAGSDEBUG=-g - -# Include arch specific makefile. +# arch specific defines .IF "$(CPUNAME)" == "INTEL" -.INCLUDE : unxfbsdi.mk -.ENDIF -.IF "$(CPUNAME)" == "X86_64" -.INCLUDE : unxfbsdx.mk +CDEFS+=-DX86 .ENDIF -# filter for supressing verbose messages from linker -#not needed at the moment -#LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter" - -# _PTHREADS is needed for the stl -CDEFS+=$(PTHREAD_CFLAGS) -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 - -# enable visibility define in "sal/types.h" -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CDEFS += -DHAVE_GCC_VISIBILITY_FEATURE -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# this is a platform with JAVA support -.IF "$(SOLAR_JAVA)"!="" -JAVADEF=-DSOLAR_JAVA -.IF "$(debug)"=="" -JAVA_RUNTIME=-ljava -.ELSE -JAVA_RUNTIME=-ljava_g -.ENDIF +.IF "$(CPUNAME)" == "X86_64" +CDEFS+=-DX86_64 +BUILD64=1 .ENDIF -# name of C++ Compiler -CXX*=g++ -# name of C Compiler -CC*=gcc -.IF "$(SYSBASE)"!="" -CFLAGS_SYSBASE:=-isystem $(SYSBASE)/usr/include -CXX+:=$(CFLAGS_SYSBASE) -CC+:=$(CFLAGS_SYSBASE) -.ENDIF # "$(SYSBASE)"!="" -CFLAGS+=-fmessage-length=0 -c - -# flags to enable build with symbols -CFLAGSENABLESYMBOLS=-g +.INCLUDE : unxgcc.mk -# flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -# Flags for enabling exception handling -CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs # Flags for disabling exception handling -CFLAGS_NO_EXCEPTIONS=-fno-exceptions - -# -fpermissive should be removed as soon as possible -CFLAGSCXX= -pipe $(ARCH_FLAGS) -PICSWITCH:=-fpic -.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -CFLAGSCXX += -fvisibility-inlines-hidden -.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" - -# Compiler flags for compiling static object in multi threaded environment with graphical user interface -CFLAGSOBJGUIMT= -# Compiler flags for compiling static object in multi threaded environment with character user interface -CFLAGSOBJCUIMT= -# Compiler flags for compiling shared object in multi threaded environment with graphical user interface -CFLAGSSLOGUIMT=$(PICSWITCH) -# Compiler flags for compiling shared object in multi threaded environment with character user interface -CFLAGSSLOCUIMT=$(PICSWITCH) -# Compiler flags for profiling -CFLAGSPROF= -# Compiler flags for debugging -CFLAGSDEBUG=-g -CFLAGSDBGUTIL= -# Compiler flags for disabling optimizations -CFLAGSNOOPT=-O0 -# Compiler flags for describing the output path -CFLAGSOUTOBJ=-o - -# -Wshadow does not work for C with nested uses of pthread_cleanup_push: -CFLAGSWARNCC=-Wall -Wextra -Wendif-labels -CFLAGSWARNCXX=$(CFLAGSWARNCC) -Wshadow -Wno-ctor-dtor-privacy \ - -Wno-non-virtual-dtor -CFLAGSWALLCC=$(CFLAGSWARNCC) -CFLAGSWALLCXX=$(CFLAGSWARNCXX) -CFLAGSWERRCC=-Werror - -# Once all modules on this platform compile without warnings, set -# COMPILER_WARN_ERRORS=TRUE here instead of setting MODULES_WITH_WARNINGS (see -# settings.mk): Currently this is not tested on FreeBSD -#MODULES_WITH_WARNINGS := - -# switches for dynamic and static linking -STATIC = -Wl,-Bstatic -DYNAMIC = -Wl,-Bdynamic - -# name of linker -LINK*=$(CXX) -LINKC*=$(CC) +CFLAGS_NO_EXCEPTIONS+=-DBOOST_NO_EXCEPTIONS # default linker flags -LINKFLAGSDEFS*=#-Wl,-z,defs -LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\' -LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\' - #TODO: drop $ORIGIN once no URE executable is also shipped in OOo -LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\' -LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\' -LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/program:$$ORIGIN/../basis-link/ure-link/lib'\' -LINKFLAGSRUNPATH_OXT= -LINKFLAGSRUNPATH_NONE= -LINKFLAGS=-Wl,-z,combreloc $(LINKFLAGSDEFS) - -# linker flags for linking applications -LINKFLAGSAPPGUI= -Wl,-export-dynamic -LINKFLAGSAPPCUI= -Wl,-export-dynamic - -# linker flags for linking shared libraries -LINKFLAGSSHLGUI= -shared -LINKFLAGSSHLCUI= -shared - -LINKFLAGSTACK= -LINKFLAGSPROF= -LINKFLAGSDEBUG=-g -LINKFLAGSOPT= - -# linker flags for optimization (symbol hashtable) -# for now, applied to symbol scoped libraries, only -LINKFLAGSOPTIMIZE*=-Wl,-O1 -LINKVERSIONMAPFLAG=$(LINKFLAGSOPTIMIZE) -Wl,--version-script - -SONAME_SWITCH=-Wl,-h - -# Sequence of libs does matter ! - -STDLIBCPP=-lstdc++ - -# default objectfilenames to link -STDOBJVCL=$(L)/salmain.o -STDOBJGUI= -STDSLOGUI= -STDOBJCUI= -STDSLOCUI= - -# libraries for linking applications -STDLIBGUIMT=-lX11 $(PTHREAD_LIBS) -lm -STDLIBCUIMT=$(PTHREAD_LIBS) -lm -# libraries for linking shared libraries -STDSHLGUIMT=-lX11 -lXext $(PTHREAD_LIBS) -lm -STDSHLCUIMT=$(PTHREAD_LIBS) -lm - -LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive - -# name of library manager -LIBMGR=ar -LIBFLAGS=-r - -# tool for generating import libraries -IMPLIB= -IMPLIBFLAGS= - -MAPSYM= -MAPSYMFLAGS= - -RC=irc -RCFLAGS=-fo$@ $(RCFILES) -RCLINK= -RCLINKFLAGS= -RCSETVERSION= +LINKFLAGSDEFS:= # platform specific identifier for shared libs -DLLPRE=lib -DLLPOST=.so +DLLPOSTFIX=fb diff --git a/solenv/inc/unxfbsdi.mk b/solenv/inc/unxfbsdi.mk deleted file mode 100644 index c01fc21..0000000 --- a/solenv/inc/unxfbsdi.mk +++ /dev/null @@ -1,43 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# -# FreBSD/i386 specific defines -# - -CDEFS+=-DX86 - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -ARCH_FLAGS*=-mtune=pentiumpro - -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" diff --git a/solenv/inc/unxfbsdx.mk b/solenv/inc/unxfbsdx.mk deleted file mode 100644 index 6fb0641..0000000 --- a/solenv/inc/unxfbsdx.mk +++ /dev/null @@ -1,47 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -# -# FreBSD/amd64 specific defines -# - -CDEFS+=-DX86_64 - -# architecture dependent flags for the C and C++ compiler that can be changed by -# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build -.IF "$(CPUNAME)" == "X86_64" -ARCH_FLAGS*= -.ENDIF - -# Compiler flags for enabling optimizations -.IF "$(PRODUCT)"!="" -CFLAGSOPT=-O2 -fno-strict-aliasing # optimizing for products -.ELSE # "$(PRODUCT)"!="" -CFLAGSOPT= # no optimizing for non products -.ENDIF # "$(PRODUCT)"!="" - -BUILD64=1 -- 1.7.6
Attachment:
pgpokkkV2VUeH.pgp
Description: PGP signature