NetBSD port
This commit is contained in:
Ulrich Wilkens
committed by
Jon Trulson
Jon Trulson
parent
a4f9413950
commit
2712d5f787
@@ -178,6 +178,11 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $
|
||||
# define i386Architecture
|
||||
# undef i386
|
||||
# endif
|
||||
# ifdef __amd64__
|
||||
# define AMD64BsdArchitecture
|
||||
# define AMD64Architecture
|
||||
# undef amd64
|
||||
# endif
|
||||
# if defined(__sparc__) || defined(sparc)
|
||||
# define SparcArchitecture
|
||||
# undef sparc
|
||||
|
||||
@@ -1482,7 +1482,7 @@ BuildMakefileTarget(Imakefile,NullParameter)
|
||||
else \ @@\
|
||||
echo "mkdir dir"; mkdir dir; \ @@\
|
||||
for i in $(SUBDIRS); do \ @@\
|
||||
j=`echo "$$i" | sed -e 's;[^/]\{1,\};..;g'`; \ @@\
|
||||
j=`echo "$$i" | $(SED) -e 's;[^/]\{1,\};..;g'`; \ @@\
|
||||
$(MKDIRHIER) "dir/`dirname $$i`"; \ @@\
|
||||
echo $(LN) "$$j/$$i/dir" "dir/$$i"; \ @@\
|
||||
$(LN) "$$j/$$i/dir" "dir/$$i"; \ @@\
|
||||
@@ -2084,7 +2084,7 @@ clean:: @@\
|
||||
#ifndef MakeSubincludesForBuild
|
||||
#define MakeSubincludesForBuild(step,dir,srclist) @@\
|
||||
step:: dir srclist @@\
|
||||
@-(list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\
|
||||
@-(list=`echo srclist | $(SED) -e 's/[^ ]*\///g'`; \ @@\
|
||||
set -x; cd dir; RemoveFiles($$list)) @@\
|
||||
@for i in srclist; do \ @@\
|
||||
(set -x; cd dir; $(LN) ../$$i .); \ @@\
|
||||
@@ -2095,7 +2095,7 @@ dir:: @@\
|
||||
@@\
|
||||
clean:: @@\
|
||||
@-(if [ -d dir ]; then \ @@\
|
||||
list=`echo srclist | sed -e 's/[^ ]*\///g'`; \ @@\
|
||||
list=`echo srclist | $(SED) -e 's/[^ ]*\///g'`; \ @@\
|
||||
set -x; cd dir; RemoveFile($$list); else exit 0; fi)
|
||||
#endif
|
||||
|
||||
@@ -2311,7 +2311,7 @@ target:: @@\
|
||||
*) curdir=$(CURRENT_DIR)/ ;; \ @@\
|
||||
esac; \ @@\
|
||||
echo "making Makefiles in $$curdir$$i..."; \ @@\
|
||||
itmp=`echo $$i | sed -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\
|
||||
itmp=`echo $$i | $(SED) -e 's;^\./;;g' -e 's;/\./;/;g'`; \ @@\
|
||||
curtmp="$(CURRENT_DIR)" \ @@\
|
||||
toptmp=""; \ @@\
|
||||
case "$$itmp" in \ @@\
|
||||
@@ -2320,7 +2320,7 @@ target:: @@\
|
||||
do \ @@\
|
||||
toptmp="/`basename $$curtmp`$$toptmp"; \ @@\
|
||||
curtmp="`dirname $$curtmp`"; \ @@\
|
||||
itmp="`echo $$itmp | sed 's;\.\./;;'`"; \ @@\
|
||||
itmp="`echo $$itmp | $(SED) 's;\.\./;;'`"; \ @@\
|
||||
done \ @@\
|
||||
;; \ @@\
|
||||
esac; \ @@\
|
||||
@@ -2376,7 +2376,7 @@ MakeMakeSubdirs(dirs,Makefiles)
|
||||
* Also delete line numbers from the cpp output (-P is not portable, I guess).
|
||||
*/
|
||||
#ifndef CppSedMagic
|
||||
#define CppSedMagic sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
|
||||
#define CppSedMagic $(SED) -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^XCOMM$$/s//#/' -e '/^XCOMM[^a-zA-Z0-9_]/s/^XCOMM/#/'
|
||||
#endif /* CppSedMagic */
|
||||
|
||||
#ifndef CppFileTarget
|
||||
@@ -2412,7 +2412,7 @@ dst:: src deplist @@\
|
||||
RemoveFile($@) @@\
|
||||
ClearmakeOSName \
|
||||
echo \: >$@ @@\
|
||||
sed '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\
|
||||
$(SED) '1d' src | $(CPP) CppNoLineInfoOption defs | CppSedMagic >>$@ @@\
|
||||
chmod a+x $@ @@\
|
||||
@@\
|
||||
clean:: @@\
|
||||
@@ -2437,7 +2437,33 @@ CppFileTarget(dst,src,defs,deplist) @@\
|
||||
includes:: dst @@\
|
||||
@@\
|
||||
depend:: dst
|
||||
#endif /* CppFileTarget */
|
||||
#endif /* CppSourceFile */
|
||||
|
||||
|
||||
/*
|
||||
* SedFileTarget - generate rules to create a file by running the
|
||||
* input through sed.
|
||||
*/
|
||||
#ifndef SedFileTarget
|
||||
#define SedFileTarget(dst,src,cmds) @@\
|
||||
dst:: src @@\
|
||||
RemoveFile($@) @@\
|
||||
$(SED) cmds src >$@ @@\
|
||||
chmod a+x $@ @@\
|
||||
@@\
|
||||
clean:: @@\
|
||||
RemoveFiles(dst)
|
||||
#endif /* SedFileTarget */
|
||||
|
||||
#ifndef SedSourceFile
|
||||
#define SedSourceFile(dst,src,cmds) @@\
|
||||
SedFileTarget(dst,src,cmds) @@\
|
||||
@@\
|
||||
includes:: dst @@\
|
||||
@@\
|
||||
depend:: dst
|
||||
#endif /* SedSourceFile */
|
||||
|
||||
|
||||
/*
|
||||
* MakeDirectories - generate rules to create a hierarchy of directories.
|
||||
|
||||
@@ -650,6 +650,12 @@ XCOMM the platform-specific parameters - edit site.def to change
|
||||
#ifndef MvCmd
|
||||
#define MvCmd mv
|
||||
#endif
|
||||
#ifndef SedCmd
|
||||
#define SedCmd sed
|
||||
#endif
|
||||
#ifndef PerlCmd
|
||||
#define PerlCmd /usr/bin/perl
|
||||
#endif
|
||||
#ifndef RanlibCmd
|
||||
#define RanlibCmd ranlib
|
||||
#endif
|
||||
@@ -968,6 +974,8 @@ CXXEXTRA_INCLUDES = CplusplusExtraIncludes
|
||||
MAKE = MakeCmd
|
||||
MV = MvCmd
|
||||
CP = CpCmd
|
||||
SED = SedCmd
|
||||
PERL = PerlCmd
|
||||
#if DoRanlibCmd
|
||||
RANLIB = RanlibCmd
|
||||
RANLIBINSTFLAGS = RanlibInstFlags
|
||||
|
||||
@@ -591,7 +591,7 @@ LINTXMWIDGETLIB = $(MWIDGETSRC)/llib-l/Xm.ln
|
||||
#if defined(LinuxArchitecture)
|
||||
MOTIF_DOC = $(shell if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi)
|
||||
#elif defined(BSDArchitecture)
|
||||
MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; fi
|
||||
MOTIF_DOC != if test -f $(MDOCSRC)/C/guides/bookcase.bc; then echo -D_MOTIFDOC_; else echo; fi
|
||||
#else
|
||||
MOTIF_DOC = -D_MOTIFDOC_
|
||||
#endif
|
||||
|
||||
@@ -4,50 +4,36 @@ XCOMM platform: $XConsortium: NetBSD.cf /main/16 1996/10/31 14:47:14 kaleb $
|
||||
|
||||
XCOMM platform: $XFree86: xc/config/cf/NetBSD.cf,v 3.44 1996/10/23 13:07:55 dawes Exp $
|
||||
|
||||
#ifndef OpenBSDArchitecture
|
||||
|
||||
#ifndef OSName
|
||||
#define OSName NetBSD 1.2
|
||||
#define OSName DefaultOSName
|
||||
#endif
|
||||
#ifndef OSMajorVersion
|
||||
#define OSMajorVersion 1
|
||||
#define OSMajorVersion DefaultOSMajorVersion
|
||||
#endif
|
||||
#ifndef OSMinorVersion
|
||||
#define OSMinorVersion 2
|
||||
#define OSMinorVersion DefaultOSMinorVersion
|
||||
#endif
|
||||
/* 1 = A, 2 = B, 3 = C */
|
||||
#ifndef OSTeenyVersion
|
||||
#define OSTeenyVersion 0
|
||||
#define OSTeenyVersion DefaultOSTeenyVersion
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
#ifndef OSName
|
||||
#define OSName OpenBSD 2.0
|
||||
#endif
|
||||
#ifndef OSMajorVersion
|
||||
#define OSMajorVersion 2
|
||||
#endif
|
||||
#ifndef OSMinorVersion
|
||||
#define OSMinorVersion 0
|
||||
#endif
|
||||
/* 1 = A, 2 = B, 3 = C */
|
||||
#ifndef OSTeenyVersion
|
||||
#define OSTeenyVersion 0
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef OSVendor
|
||||
#define OSVendor /**/
|
||||
#endif
|
||||
XCOMM operating system: OSName
|
||||
|
||||
#define LibDir /usr/X11R7/lib/X11
|
||||
#define UsrLibDir /usr/X11R7/lib
|
||||
#define ManDirectoryRoot /usr/X11R7/man
|
||||
#define FontDir /usr/X11R7/lib/X11/fonts
|
||||
#define FontEncDir /usr/X11R7/lib/X11/fonts/encodings
|
||||
|
||||
/*
|
||||
* C library features
|
||||
*/
|
||||
#if defined(OpenBSDArchitecture) || \
|
||||
defined(NetBSDArchitecture) && (OsMajorVersion == 1 && OsMinorVersion >= 2)
|
||||
#if defined(NetBSDArchitecture) && (OsMajorVersion == 1 && OsMinorVersion >= 2)
|
||||
# define HasPoll YES
|
||||
#endif
|
||||
#define HasNdbm YES
|
||||
@@ -75,7 +61,7 @@ XCOMM operating system: OSName
|
||||
/*
|
||||
* There's a bug in NetBSD 1.0, 1.1 and 1.2 dlsym()
|
||||
*/
|
||||
#if !defined(OpenBSDArchitecture) && OSMajorVersion == 1 && OSMinorVersion <= 2
|
||||
#if OSMajorVersion == 1 && OSMinorVersion <= 2
|
||||
# define HasDlsymBug YES
|
||||
#endif
|
||||
|
||||
@@ -92,11 +78,6 @@ XCOMM operating system: OSName
|
||||
#define UseGas YES
|
||||
#define GnuCpp YES
|
||||
|
||||
/* OpenBSD has gcc 2.7.2.1 which fixes the strength-reduce bug */
|
||||
#ifdef OpenBSDArchitecture
|
||||
#define DefaultGcc2i386Opt -O2
|
||||
#endif
|
||||
|
||||
#define NeedConstPrototypes YES
|
||||
#define NeedFunctionPrototypes YES
|
||||
#define NeedNestedPrototypes YES
|
||||
@@ -105,29 +86,29 @@ XCOMM operating system: OSName
|
||||
|
||||
#define MkdirHierCmd mkdir -p
|
||||
|
||||
#define CppCmd /usr/libexec/cpp
|
||||
#define PerlCmd /usr/pkg/bin/perl
|
||||
|
||||
#define CppCmd /usr/bin/cpp
|
||||
#define StandardCppDefines -traditional
|
||||
#define PreProcessCmd CppCmd
|
||||
#ifndef OpenBSDArchitecture
|
||||
#define PreIncDir /usr/include
|
||||
#else
|
||||
#define PreIncDir /usr/lib/gcc-lib/i386-unknown-openbsd1.2/2.7.2.1/include
|
||||
#endif
|
||||
|
||||
#undef CcCmd
|
||||
#define CcCmd gcc
|
||||
#if UseInstalled
|
||||
#define DefaultCCOptions /**/
|
||||
#else
|
||||
#define DefaultCCOptions -ansi -Dasm=__asm
|
||||
#define DefaultCCOptions -pipe
|
||||
#endif
|
||||
|
||||
#define CplusplusLibC -lm -lstdc++
|
||||
|
||||
#define GccGasOption -DGCCUSESGAS
|
||||
#define AsmDefines -DUSE_GAS
|
||||
|
||||
|
||||
#ifdef i386Architecture
|
||||
# define OptimizedCDebugFlags -m486 DefaultGcc2i386Opt
|
||||
# define OptimizedCDebugFlags -O2
|
||||
# if OSMajorVersion < 1
|
||||
# define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -DXNO_SYSCONF
|
||||
# else
|
||||
@@ -166,11 +147,7 @@ XCOMM operating system: OSName
|
||||
#define ExtraLibraries /**/
|
||||
#endif
|
||||
#ifndef UseGnuMalloc
|
||||
#ifndef OpenBSDArchitecture
|
||||
# define UseGnuMalloc YES
|
||||
#else
|
||||
# define UseGnuMalloc NO
|
||||
#endif
|
||||
# define UseGnuMalloc YES
|
||||
#endif
|
||||
#ifndef GnuMallocLibrary
|
||||
#define GnuMallocLibrary -lgnumalloc
|
||||
@@ -188,6 +165,7 @@ XCOMM operating system: OSName
|
||||
#define CompressAllFonts YES
|
||||
#define DefaultUserPath .:/bin:/usr/bin:/usr/local/bin:$(BINDIR)
|
||||
#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR)
|
||||
#define BuildLibPathVar LD_LIBRARY_PATH
|
||||
|
||||
#ifdef InstallCmd
|
||||
# undef InstallCmd
|
||||
@@ -228,60 +206,6 @@ dirs: .EXEC @@\
|
||||
@@\
|
||||
.EXEC:
|
||||
|
||||
XCOMM Man pages need to be formatted when installed, so override the default
|
||||
XCOMM imake rules.
|
||||
|
||||
#define ManSuffix 1
|
||||
#define FileManSuffix 5
|
||||
#define ManSourcePath $(MANPATH)/cat
|
||||
|
||||
#define InstallManPageLong(file,destdir,dest) @@\
|
||||
all:: file.0 @@\
|
||||
@@\
|
||||
file.0:: file.man @@\
|
||||
@if [ -f file.man ]; \ @@\
|
||||
then \ @@\
|
||||
cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\
|
||||
cp /tmp/$$$$.man file.0; \ @@\
|
||||
$(RM) /tmp/$$$$.man; \ @@\
|
||||
fi @@\
|
||||
@@\
|
||||
install.man:: @@\
|
||||
MakeDir($(DESTDIR)destdir) @@\
|
||||
-@if [ -f file.0 ]; \ @@\
|
||||
then \ @@\
|
||||
$(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\
|
||||
fi
|
||||
|
||||
#define InstallGenManPageLong(file,destdir,dest,suffix) @@\
|
||||
InstallManPageLong(file,destdir,dest)
|
||||
|
||||
#define InstallMultipleManSuffix(list,dest,suff) @@\
|
||||
install.man:: @@\
|
||||
MakeDir($(DESTDIR)dest) @@\
|
||||
case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
|
||||
for i in list; do \ @@\
|
||||
(set -x; \ @@\
|
||||
cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \ @@\
|
||||
$(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \ @@\
|
||||
$(RM) /tmp/$$$$.suff); \ @@\
|
||||
done
|
||||
|
||||
#define InstallMultipleMan(list,dest) @@\
|
||||
InstallMultipleManSuffix(list,dest,man)
|
||||
|
||||
#define InstallManPageAliases(file,destdir,aliases) @@\
|
||||
install.man:: @@\
|
||||
@case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\
|
||||
for i in aliases; do \ @@\
|
||||
(set -x; \ @@\
|
||||
$(RM) $(DESTDIR)destdir/$$i.0;\ @@\
|
||||
(cd $(DESTDIR)/destdir; $(LN) file.0 $$i.0);\ @@\
|
||||
); \ @@\
|
||||
done
|
||||
|
||||
#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\
|
||||
InstallManPageAliases(file,destdir,aliases)
|
||||
|
||||
#include <bsdLib.rules>
|
||||
|
||||
@@ -326,3 +250,61 @@ sed 's/\.[0-9]*$$//'`
|
||||
#define SharedXtReqs $(XLIBONLY) $(SMLIB) $(ICELIB)
|
||||
#define SharedXmuReqs $(LDPRELIB) $(XTOOLONLYLIB) $(XONLYLIB) $(EXTENSIONLIB)
|
||||
#endif
|
||||
|
||||
|
||||
/* For DtHelp TIFF processing routines. */
|
||||
#ifdef AMD64Architecture
|
||||
#define LSBBitOrder YES
|
||||
#endif
|
||||
|
||||
#ifdef ARMArchitecture
|
||||
#define LSBBitOrder YES
|
||||
#endif
|
||||
|
||||
#ifdef i386Architecture
|
||||
#define LSBBitOrder YES
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Generic settings for all architectures
|
||||
* which can be overridden by architecture specific sections above
|
||||
*/
|
||||
|
||||
#ifdef HasGcc2
|
||||
CXXDEPENDINCLUDE != CppCmd -x c++ -Wp,-v < /dev/null \
|
||||
2>&1 | sed -n 's/ \(.*[cg]++.*\)/-I\1/p'
|
||||
#define CplusplusDependIncludes $(CXXDEPENDINCLUDE)
|
||||
#endif
|
||||
|
||||
#ifndef StandardIncludes
|
||||
# define StandardIncludes -I/usr/pkg/include -I/usr/local/include
|
||||
#endif
|
||||
|
||||
#ifndef MTop
|
||||
#define MTop $(TOP)/imports/motif
|
||||
#endif
|
||||
|
||||
#ifndef TopMotifInclude
|
||||
# define TopMotifInclude /usr/pkg/include
|
||||
#endif
|
||||
|
||||
#ifndef ExtraLoadFlags
|
||||
# define ExtraLoadFlags -Wl,-rpath,$(USRLIBDIRPATH):$(CDE_INSTALLATION_TOP)/lib
|
||||
#endif
|
||||
|
||||
#ifndef SharedTtReqs
|
||||
# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) -Wl,-rpath,$(USRLIBDIRPATH)
|
||||
#endif
|
||||
|
||||
#ifndef SharedDtSvcReqs
|
||||
# define SharedDtSvcReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) -Wl,-rpath,$(USRLIBDIRPATH)
|
||||
#endif
|
||||
|
||||
#ifndef SharedCsaReqs
|
||||
# define SharedCsaReqs -lXt $(LDPOSTLIBS) -Wl,-rpath,$(USRLIBDIRPATH)
|
||||
#endif
|
||||
|
||||
#ifndef KornShell
|
||||
#define KornShell /usr/pkg/bin/ksh93
|
||||
#endif
|
||||
|
||||
@@ -73,6 +73,8 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
|
||||
# define X11ProjectRoot /usr/local
|
||||
# elif defined(OpenBSDArchitecture)
|
||||
# define X11ProjectRoot /usr/X11R6
|
||||
# elif defined(NetBSDArchitecture)
|
||||
# define X11ProjectRoot /usr/X11R7
|
||||
# else
|
||||
# define X11ProjectRoot /X11
|
||||
# endif
|
||||
@@ -83,6 +85,8 @@ XCOMM site: $TOG: site.def /main/23 1998/03/19 18:43:26 mgreess $
|
||||
# define MotifProjectRoot /usr/local
|
||||
# elif defined(OpenBSDArchitecture)
|
||||
# define MotifProjectRoot /usr/local
|
||||
# elif defined(NetBSDArchitecture)
|
||||
# define MotifProjectRoot /usr/pkg
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user