1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
freebsd-ports/www/fhttpd/files/patch-ac
2002-09-05 02:49:33 +00:00

59 lines
1.7 KiB
Plaintext

--- Makefile.orig Mon Apr 19 10:38:56 1999
+++ Makefile Wed Sep 4 19:46:45 2002
@@ -10,8 +10,8 @@
# Default compilers and linker
-CC = gcc
-CXX = g++
+CC ?= cc
+CXX ?= c++
LD = $(CXX)
# OS-dependent definitions (choose one and adjust, if necessary)
@@ -99,21 +99,21 @@
## for Linux (glibc2/libc 6):
#
-COPTS = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
- -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
- -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
- -D__s32=int\
- -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
-LFLAGS= -lcrypt
+#COPTS = -Wall -O3 -felide-constructors -DLS_OPTIONS_IGNORE\
+# -DNEED_CRYPT_H -DCMSG_DATA_IS_A_MACRO \
+# -DMMAPPAGESIZE=65536 -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+# -D__s32=int\
+# -DGLOBAL_TIMEZONE -DGLIBC -DERRNO_DEFINED # -DFLOCK
+#LFLAGS= -lcrypt
## for FreeBSD 2.2:
#
-#COPTS = -O2 -fno-strength-reduce -DLS_OPTIONS_IGNORE\
-# -D__s32=int -DMMAPPAGESIZE=65536\
-# -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
-# -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
-# -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
-#LFLAGS = -lcrypt
+COPTS = -fno-strength-reduce -DLS_OPTIONS_IGNORE\
+ -D__s32=int -DMMAPPAGESIZE=65536\
+ -DPSEUDOPOLL -DCMSG_DATA_IS_A_MACRO\
+ -DSIGARGS="int sig" -DSIGACTARGS="int sig"\
+ -DTM_GMTOFF_PRESENT -DERRNO_DEFINED # -DFLOCK
+LFLAGS = -lcrypt
# End of OS-dependent definitions
@@ -126,8 +126,8 @@
# Don't modify anything below
CXXOPTS = $(COPTS)
-CXXFLAGS = $(CXXOPTS) $(DEBUG)
-CFLAGS = $(COPTS) $(DEBUG)
+CXXFLAGS += $(CXXOPTS) $(DEBUG)
+CFLAGS += $(COPTS) $(DEBUG)
FHTTPD_OFILES = pseudopoll.o lists.o wildmat.o util.o configfile.o users.o \
process.o log.o loadedfile.o sockobj.o configargs.o fhttpd.o