Skip to content

Commit 3eec6ee

Browse files
peterepetere
committed
Rename templates to match names in makefiles/Makefile.* and include/port.
Read templates after compiler is detected. Convert all templates to real shell scripts. Rename bsd->openbsd, alpha->osf.
1 parent 739a056 commit 3eec6ee

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1036
-1220
lines changed

‎configure

Lines changed: 647 additions & 625 deletions
Large diffs are not rendered by default.

‎configure.in

Lines changed: 215 additions & 253 deletions
Large diffs are not rendered by default.

‎src/include/port/bsd.h renamed to ‎src/include/port/openbsd.h

File renamed without changes.

‎src/include/port/alpha.h renamed to ‎src/include/port/osf.h

File renamed without changes.

‎src/makefiles/Makefile.bsd renamed to ‎src/makefiles/Makefile.openbsd

File renamed without changes.

‎src/makefiles/Makefile.alpha renamed to ‎src/makefiles/Makefile.osf

File renamed without changes.

‎src/template/.similar

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎src/template/aix

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
AROPT=crs
2+
DLSUFFIX=.so
3+
4+
if test "$GCC" = yes ; then
5+
CFLAGS=-pipe
6+
CXXFLAGS=-pipe
7+
SHARED_LIB=-lc
8+
else # not GCC
9+
case $host_os in
10+
aix3.2.5)
11+
CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg'
12+
SHARED_LIB='-e _nostart -lc'
13+
;;
14+
aix4.1)
15+
CFLAGS='-qchars=signed -qmaxmem=8192 -qhalt=w -qsrcmsg -qcheck=divzero'
16+
SHARED_LIB='-bnoentry -lc'
17+
;;
18+
aix4.2 | aix4.3)
19+
CFLAGS='-qmaxmem=16384 -qhalt=w -qsrcmsg -qlanglvl=extended -qlonglong'
20+
SHARED_LIB='-lc'
21+
;;
22+
esac
23+
fi # not GCC

‎src/template/aix_325

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/aix_41

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/aix_42

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/aix_gcc

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/template/alpha_gcc

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎src/template/bsdi

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
AROPT=cq
2+
CFLAGS='-O2 -pipe'
3+
4+
case $host_cpu in
5+
i?86) CFLAGS="$CFLAGS -m486";;
6+
esac
7+
8+
case $host_os in
9+
bsdi2.0) CFLAGS="$CFLAGS -DPRE_BSDI_2_1";;
10+
esac
11+
12+
case $host_os in
13+
bsdi2.0 | bsdi2.1 | bsdi3)
14+
SHARED_LIB=
15+
DLSUFFIX=.o
16+
CC=gcc2
17+
;;
18+
bsdi4)
19+
SHARED_LIB=-fpic
20+
DLSUFFIX=.so
21+
;;
22+
esac

‎src/template/bsdi_2.0

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/bsdi_2.1

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/bsdi_4.0

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/bsdi_4.0_sparc

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/cygwin32

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/template/dgux

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
AROPT:crs
2-
CFLAGS:
3-
LIBS:-lsocket -lnsl
4-
SHARED_LIB:-fpic
5-
ALL:
6-
SRCH_INC:
7-
SRCH_LIB:
8-
DLSUFFIX:.so
1+
AROPT=crs
2+
CFLAGS=
3+
SHARED_LIB=-fpic
4+
DLSUFFIX=.so

‎src/template/freebsd

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
AROPT:cq
2-
SHARED_LIB:-fpic -DPIC
3-
CFLAGS:-O2 -m486 -pipe
4-
SRCH_INC:
5-
SRCH_LIB:
6-
DLSUFFIX:.so
1+
AROPT=cq
2+
SHARED_LIB='-fpic -DPIC'
3+
CFLAGS='-O2 -m486 -pipe'
4+
DLSUFFIX=.so

‎src/template/generic

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/hpux

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
AROPT=crs
2+
DLSUFFIX=.sl
3+
4+
if test "$GCC" = yes ; then
5+
CFLAGS=-O2
6+
SHARED_LIB=-fPIC
7+
DL_LIB=/usr/lib/libdld.sl
8+
CCC=g++
9+
else
10+
CFLAGS='-Wl,-E -Ae'
11+
SHARED_LIB=+z
12+
CPP='cc -E -Ae'
13+
CCC=aCC
14+
fi

‎src/template/hpux_cc

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎src/template/hpux_gcc

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/template/irix5

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
AROPT:crs
2-
CFLAGS:
3-
SHARED_LIB:
4-
ALL:
5-
SRCH_INC:
6-
SRCH_LIB:
7-
DLSUFFIX:.so
1+
AROPT=crs
2+
CFLAGS=
3+
SHARED_LIB=
4+
DLSUFFIX=.so

‎src/template/linux

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
AROPT=crs
2+
CFLAGS=-O2
3+
SHARED_LIB=-fpic
4+
DLSUFFIX=.so
5+
6+
case $host_cpu in
7+
mips*) CFLAGS="$CFLAGS -mips2";;
8+
alpha*) CPU=alpha;;
9+
esac

‎src/template/linux_alpha

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎src/template/linux_arm

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/linux_i386

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/linux_m68k

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/linux_mips

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/linux_ppc

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/linux_sparc

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎src/template/netbsd

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
AROPT:cq
2-
SHARED_LIB:-fpic -DPIC
3-
CFLAGS:-O2 -pipe
4-
SRCH_INC:
5-
SRCH_LIB:
6-
DLSUFFIX:.so
1+
AROPT=cq
2+
SHARED_LIB='-fpic -DPIC'
3+
CFLAGS='-O2 -pipe'
4+
DLSUFFIX=.so

‎src/template/nextstep

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
AROPT:rc
2-
CFLAGS:
3-
SHARED_LIB:
4-
ALL:
5-
SRCH_INC:
6-
SRCH_LIB:
7-
DLSUFFIX:.o
1+
AROPT=rc
2+
CFLAGS=
3+
SHARED_LIB=
4+
DLSUFFIX=.o

‎src/template/openbsd

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
AROPT:cq
2-
SHARED_LIB:-fpic -DPIC
3-
CFLAGS:-O2 -pipe
4-
SRCH_INC:
5-
SRCH_LIB:
6-
DLSUFFIX:.so
1+
AROPT=cq
2+
SHARED_LIB='-fpic -DPIC'
3+
CFLAGS='-O2 -pipe'
4+
DLSUFFIX=.so

‎src/template/alpha_cc renamed to ‎src/template/osf

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
AROPT:crs
1+
AROPT=crs
2+
23
# NOFIXADE disallows unaligned access.
34
# on Ultrix and OSF/1 it invokes an explicit syscall.
45
# on HP-UX it turns off certain compiler options.
56
# This is defined here because a bunch of clients include tmp/c.h,
67
# which is where the work is done on HP-UX. It only affects the
78
# backend on Ultrix and OSF/1.
8-
CC:cc
9-
CFLAGS:-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000
10-
LDFLAGS='-rpath $(LIBDIR)'
11-
SHARED_LIB:
12-
ALL:
13-
SRCH_INC:
14-
SRCH_LIB:
15-
DLSUFFIX:.so
16-
CCC:cxx
17-
CXXFLAGS:-D__alpha__ -DNOFIXADE -O4 -Olimit 2000
9+
10+
if test "$GCC" = yes ; then
11+
CFLAGS='-D__alpha__ -DNOFIXADE'
12+
CCC=g++
13+
else
14+
CFLAGS='-D__alpha__ -DNOFIXADE -std -O4 -Olimit 2000'
15+
LDFLAGS='-rpath $(libdir)'
16+
CCC=cxx
17+
CXXFLAGS='-D__alpha__ -DNOFIXADE -O4 -Olimit 2000'
18+
fi
19+
20+
DLSUFFIX=.so
21+
SHARED_LIB=

0 commit comments

Comments
 (0)