You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by Dean Gaudet <dg...@arctic.org> on 1997/06/30 03:10:33 UTC
[PATCH] PR#372: use LDFLAGS not LFLAGS
LFLAGS has a predefined meaning, for passing flags to lex. We're supposed
to use LDFLAGS when passing flags to the link stage of cc. I chose to be
consistent in this patch, which nails all occurances of LFLAGS, including
EXTRA_LFLAGS. Proposed for 1.3 only.
Dean
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.309
diff -u -r1.309 CHANGES
--- CHANGES 1997/06/29 23:54:49 1.309
+++ CHANGES 1997/06/30 01:08:18
@@ -1,5 +1,9 @@
Changes with Apache 1.3
-
+
+ *) EXTRA_LFLAGS was changed to EXTRA_LDFLAGS (and LFLAGS was changed
+ to LDFLAGS) to avoid complications with lex rules in make files.
+ [Dean Gaudet] PR#372
+
*) Add a ListenBacklog directive to control the backlog parameter
passed to listen(). Also change the default to 511 from 512.
[Marc Slemko]
Index: Configuration.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
retrieving revision 1.63
diff -u -r1.63 Configuration.tmpl
--- Configuration.tmpl 1997/05/10 17:14:36 1.63
+++ Configuration.tmpl 1997/06/30 01:08:20
@@ -42,7 +42,7 @@
# the C compiler, and set OPTIM to '-O2'
#
EXTRA_CFLAGS=
-EXTRA_LFLAGS=
+EXTRA_LDFLAGS=
EXTRA_LIBS=
EXTRA_INCLUDES=
Index: Configure
===================================================================
RCS file: /export/home/cvs/apache/src/Configure,v
retrieving revision 1.102
diff -u -r1.102 Configure
--- Configure 1997/06/29 18:26:55 1.102
+++ Configure 1997/06/30 01:08:22
@@ -143,7 +143,7 @@
# Now we determine the OS/Platform automagically, thanks to
# GuessOS, a home-brewed OS-determiner ala config.guess
#
-# We adjust CFLAGS, LIBS, LFLAGS and INCLUDES (and other Makefile
+# We adjust CFLAGS, LIBS, LDFLAGS and INCLUDES (and other Makefile
# options) as required. Setting CC and OPTIM here has no effect
# if they were set in Configure.
#
@@ -191,13 +191,13 @@
OS='MPE/iX'
CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
LIBS="$LIBS -lsocket"
- LFLAGS="$LFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
+ LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
;;
*-apple-aux3*)
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
- LFLAGS="$LFLAGS -s"
+ LDFLAGS="$LDFLAGS -s"
DEF_WANTHSREGEX=no
;;
i386-ibm-aix*)
@@ -256,7 +256,7 @@
echo "You are running 64-bit Irix. For now, we will compile 32-bit"
echo "but if you would care to port to 64-bit, send us the patches."
CFLAGS="$CFLAGS -n32"
- LFLAGS="$LFLAGS -n32"
+ LDFLAGS="$LDFLAGS -n32"
DEF_WANTHSREGEX=yes
DBM_LIB=""
if [ "$RULE_IRIXNIS" = "yes" ]; then
@@ -357,7 +357,7 @@
OS='ISC 4'
CC='gcc'
CFLAGS="$CFLAGS -posix -DISC"
- LFLAGS="$LFLAGS -posix"
+ LDFLAGS="$LDFLAGS -posix"
LIBS="$LIBS -linet"
DEF_WANTHSREGEX=yes
;;
@@ -454,11 +454,11 @@
;;
*powerpc-tenon-machten*)
OS='MachTen PPC'
- LFLAGS="$LFLAGS -Xlstack=0x14000 -Xldelcsect"
+ LDFLAGS="$LDFLAGS -Xlstack=0x14000 -Xldelcsect"
;;
*-machten*)
OS='MachTen 68K'
- LFLAGS="$LFLAGS -stack 0x14000"
+ LDFLAGS="$LDFLAGS -stack 0x14000"
DEF_WANTHSREGEX=yes
;;
*convex-v11*)
@@ -585,7 +585,7 @@
#
# Now SOCKS4.
# NOTE: We assume that if they are using SOCKS4, then they've
-# adjusted EXTRA_LIBS and/or EXTRA_LFLAGS as required,
+# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
# otherwise we assume "-L/usr/local/lib -lsocks"
#
if [ "$RULE_SOCKS4" = "yes" ]; then
@@ -614,7 +614,7 @@
echo "CFLAGS1=$CFLAGS">> Makefile.config
echo "INCLUDES1=$INCLUDES">> Makefile.config
echo "LIBS1=$LIBS">> Makefile.config
-echo "LFLAGS1=$LFLAGS">> Makefile.config
+echo "LDFLAGS1=$LDFLAGS">> Makefile.config
echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
echo "REGLIB=$REGLIB">> Makefile.config
echo "RANLIB=$RANLIB">> Makefile.config
Index: INSTALL
===================================================================
RCS file: /export/home/cvs/apache/src/INSTALL,v
retrieving revision 1.14
diff -u -r1.14 INSTALL
--- INSTALL 1997/04/14 12:45:03 1.14
+++ INSTALL 1997/06/30 01:08:22
@@ -13,7 +13,7 @@
lists the modules which have been compiled in, and also names the
files containing them. You will need to:
- a) Adjust the Rules and EXTRA_CFLAGS|LIBS|LFLAGS|INCLUDES if
+ a) Adjust the Rules and EXTRA_CFLAGS|LIBS|LDFLAGS|INCLUDES if
you feel so inclined.
b) Uncomment lines corresponding to those optional modules you wish
Index: Makefile.tmpl
===================================================================
RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
retrieving revision 1.48
diff -u -r1.48 Makefile.tmpl
--- Makefile.tmpl 1997/06/24 17:57:50 1.48
+++ Makefile.tmpl 1997/06/30 01:08:23
@@ -6,7 +6,7 @@
CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
LIBS=$(EXTRA_LIBS) $(LIBS1)
INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
-LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
+LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o buff.o\
@@ -26,7 +26,7 @@
@false
httpd: $(REGLIB) $(OBJS)
- $(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
+ $(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
regex/libregex.a:
(cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
Index: PORTING
===================================================================
RCS file: /export/home/cvs/apache/src/PORTING,v
retrieving revision 1.5
diff -u -r1.5 PORTING
--- PORTING 1997/06/23 23:56:15 1.5
+++ PORTING 1997/06/30 01:08:24
@@ -104,7 +104,7 @@
OS='A/UX 3.1.x'
CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
LIBS="$LIBS -lposix -lbsd"
- LFLAGS="$LFLAGS -s"
+ LDFLAGS="$LDFLAGS -s"
DEF_WANTHSREGEX=no
;;
@@ -114,7 +114,7 @@
below]) to handle OS-specific code. Each code that has and requires
such OS-specific code will require a unique "system cookie" defined
in 'CFLAGS'. You will also note that Configure also goes ahead and
-predefines the LIBS and LFLAGS Makefile variables (DEF_WANTHSREGEX is
+predefines the LIBS and LDFLAGS Makefile variables (DEF_WANTHSREGEX is
explained below).
conf.h:
Re: [PATCH] PR#372: use LDFLAGS not LFLAGS
Posted by Marc Slemko <ma...@worldgate.com>.
+1, but there are also a number of references outside the src/ tree in the
htdocs tree that need to be changed...
On Sun, 29 Jun 1997, Dean Gaudet wrote:
> LFLAGS has a predefined meaning, for passing flags to lex. We're supposed
> to use LDFLAGS when passing flags to the link stage of cc. I chose to be
> consistent in this patch, which nails all occurances of LFLAGS, including
> EXTRA_LFLAGS. Proposed for 1.3 only.
>
> Dean
>
> Index: CHANGES
> ===================================================================
> RCS file: /export/home/cvs/apache/src/CHANGES,v
> retrieving revision 1.309
> diff -u -r1.309 CHANGES
> --- CHANGES 1997/06/29 23:54:49 1.309
> +++ CHANGES 1997/06/30 01:08:18
> @@ -1,5 +1,9 @@
> Changes with Apache 1.3
> -
> +
> + *) EXTRA_LFLAGS was changed to EXTRA_LDFLAGS (and LFLAGS was changed
> + to LDFLAGS) to avoid complications with lex rules in make files.
> + [Dean Gaudet] PR#372
> +
> *) Add a ListenBacklog directive to control the backlog parameter
> passed to listen(). Also change the default to 511 from 512.
> [Marc Slemko]
> Index: Configuration.tmpl
> ===================================================================
> RCS file: /export/home/cvs/apache/src/Configuration.tmpl,v
> retrieving revision 1.63
> diff -u -r1.63 Configuration.tmpl
> --- Configuration.tmpl 1997/05/10 17:14:36 1.63
> +++ Configuration.tmpl 1997/06/30 01:08:20
> @@ -42,7 +42,7 @@
> # the C compiler, and set OPTIM to '-O2'
> #
> EXTRA_CFLAGS=
> -EXTRA_LFLAGS=
> +EXTRA_LDFLAGS=
> EXTRA_LIBS=
> EXTRA_INCLUDES=
>
> Index: Configure
> ===================================================================
> RCS file: /export/home/cvs/apache/src/Configure,v
> retrieving revision 1.102
> diff -u -r1.102 Configure
> --- Configure 1997/06/29 18:26:55 1.102
> +++ Configure 1997/06/30 01:08:22
> @@ -143,7 +143,7 @@
> # Now we determine the OS/Platform automagically, thanks to
> # GuessOS, a home-brewed OS-determiner ala config.guess
> #
> -# We adjust CFLAGS, LIBS, LFLAGS and INCLUDES (and other Makefile
> +# We adjust CFLAGS, LIBS, LDFLAGS and INCLUDES (and other Makefile
> # options) as required. Setting CC and OPTIM here has no effect
> # if they were set in Configure.
> #
> @@ -191,13 +191,13 @@
> OS='MPE/iX'
> CFLAGS="$CFLAGS -DMPE -D_POSIX_SOURCE -D_SOCKET_SOURCE"
> LIBS="$LIBS -lsocket"
> - LFLAGS="$LFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
> + LDFLAGS="$LDFLAGS -Xlinker \"-WL,cap=ia,ba,ph,pm;nmstack=1024000\""
> ;;
> *-apple-aux3*)
> OS='A/UX 3.1.x'
> CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
> LIBS="$LIBS -lposix -lbsd"
> - LFLAGS="$LFLAGS -s"
> + LDFLAGS="$LDFLAGS -s"
> DEF_WANTHSREGEX=no
> ;;
> i386-ibm-aix*)
> @@ -256,7 +256,7 @@
> echo "You are running 64-bit Irix. For now, we will compile 32-bit"
> echo "but if you would care to port to 64-bit, send us the patches."
> CFLAGS="$CFLAGS -n32"
> - LFLAGS="$LFLAGS -n32"
> + LDFLAGS="$LDFLAGS -n32"
> DEF_WANTHSREGEX=yes
> DBM_LIB=""
> if [ "$RULE_IRIXNIS" = "yes" ]; then
> @@ -357,7 +357,7 @@
> OS='ISC 4'
> CC='gcc'
> CFLAGS="$CFLAGS -posix -DISC"
> - LFLAGS="$LFLAGS -posix"
> + LDFLAGS="$LDFLAGS -posix"
> LIBS="$LIBS -linet"
> DEF_WANTHSREGEX=yes
> ;;
> @@ -454,11 +454,11 @@
> ;;
> *powerpc-tenon-machten*)
> OS='MachTen PPC'
> - LFLAGS="$LFLAGS -Xlstack=0x14000 -Xldelcsect"
> + LDFLAGS="$LDFLAGS -Xlstack=0x14000 -Xldelcsect"
> ;;
> *-machten*)
> OS='MachTen 68K'
> - LFLAGS="$LFLAGS -stack 0x14000"
> + LDFLAGS="$LDFLAGS -stack 0x14000"
> DEF_WANTHSREGEX=yes
> ;;
> *convex-v11*)
> @@ -585,7 +585,7 @@
> #
> # Now SOCKS4.
> # NOTE: We assume that if they are using SOCKS4, then they've
> -# adjusted EXTRA_LIBS and/or EXTRA_LFLAGS as required,
> +# adjusted EXTRA_LIBS and/or EXTRA_LDFLAGS as required,
> # otherwise we assume "-L/usr/local/lib -lsocks"
> #
> if [ "$RULE_SOCKS4" = "yes" ]; then
> @@ -614,7 +614,7 @@
> echo "CFLAGS1=$CFLAGS">> Makefile.config
> echo "INCLUDES1=$INCLUDES">> Makefile.config
> echo "LIBS1=$LIBS">> Makefile.config
> -echo "LFLAGS1=$LFLAGS">> Makefile.config
> +echo "LDFLAGS1=$LDFLAGS">> Makefile.config
> echo "BROKEN_BPRINTF_FLAGS=$OSBPRINTF">> Makefile.config
> echo "REGLIB=$REGLIB">> Makefile.config
> echo "RANLIB=$RANLIB">> Makefile.config
> Index: INSTALL
> ===================================================================
> RCS file: /export/home/cvs/apache/src/INSTALL,v
> retrieving revision 1.14
> diff -u -r1.14 INSTALL
> --- INSTALL 1997/04/14 12:45:03 1.14
> +++ INSTALL 1997/06/30 01:08:22
> @@ -13,7 +13,7 @@
> lists the modules which have been compiled in, and also names the
> files containing them. You will need to:
>
> - a) Adjust the Rules and EXTRA_CFLAGS|LIBS|LFLAGS|INCLUDES if
> + a) Adjust the Rules and EXTRA_CFLAGS|LIBS|LDFLAGS|INCLUDES if
> you feel so inclined.
>
> b) Uncomment lines corresponding to those optional modules you wish
> Index: Makefile.tmpl
> ===================================================================
> RCS file: /export/home/cvs/apache/src/Makefile.tmpl,v
> retrieving revision 1.48
> diff -u -r1.48 Makefile.tmpl
> --- Makefile.tmpl 1997/06/24 17:57:50 1.48
> +++ Makefile.tmpl 1997/06/30 01:08:23
> @@ -6,7 +6,7 @@
> CFLAGS=$(OPTIM) $(CFLAGS1) $(EXTRA_CFLAGS)
> LIBS=$(EXTRA_LIBS) $(LIBS1)
> INCLUDES=$(INCLUDES1) $(EXTRA_INCLUDES)
> -LFLAGS=$(LFLAGS1) $(EXTRA_LFLAGS)
> +LDFLAGS=$(LDFLAGS1) $(EXTRA_LDFLAGS)
>
> OBJS= alloc.o http_main.o http_core.o http_config.o http_request.o \
> http_log.o http_protocol.o rfc1413.o util.o util_script.o modules.o buff.o\
> @@ -26,7 +26,7 @@
> @false
>
> httpd: $(REGLIB) $(OBJS)
> - $(CC) $(LFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
> + $(CC) $(LDFLAGS) -o httpd $(OBJS) $(REGLIB) $(LIBS)
>
> regex/libregex.a:
> (cd regex; $(MAKE) lib CC=$(CC) AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)')
> Index: PORTING
> ===================================================================
> RCS file: /export/home/cvs/apache/src/PORTING,v
> retrieving revision 1.5
> diff -u -r1.5 PORTING
> --- PORTING 1997/06/23 23:56:15 1.5
> +++ PORTING 1997/06/30 01:08:24
> @@ -104,7 +104,7 @@
> OS='A/UX 3.1.x'
> CFLAGS="$CFLAGS -DAUX -D_POSIX_SOURCE"
> LIBS="$LIBS -lposix -lbsd"
> - LFLAGS="$LFLAGS -s"
> + LDFLAGS="$LDFLAGS -s"
> DEF_WANTHSREGEX=no
> ;;
>
> @@ -114,7 +114,7 @@
> below]) to handle OS-specific code. Each code that has and requires
> such OS-specific code will require a unique "system cookie" defined
> in 'CFLAGS'. You will also note that Configure also goes ahead and
> -predefines the LIBS and LFLAGS Makefile variables (DEF_WANTHSREGEX is
> +predefines the LIBS and LDFLAGS Makefile variables (DEF_WANTHSREGEX is
> explained below).
>
> conf.h:
>
>