Return-Path: Delivered-To: apmail-new-httpd-archive@apache.org Received: (qmail 21821 invoked by uid 500); 30 May 2000 20:06:09 -0000 Mailing-List: contact new-httpd-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list new-httpd@apache.org Received: (qmail 21808 invoked from network); 30 May 2000 20:06:08 -0000 Message-ID: <393449F2.5707E68B@us.ibm.com> Date: Tue, 30 May 2000 16:08:34 -0700 From: Ovies Brabson X-Mailer: Mozilla 4.6 [en] (WinNT; U) X-Accept-Language: en MIME-Version: 1.0 To: new-httpd@apache.org Subject: PATCH: Remove Workaround for Make Problem on OS/390 USS and TPF Content-Type: multipart/mixed; boundary="------------0EF110BFD41656CB2CD303A1" X-Spam-Rating: locus.apache.org 1.6.2 0/1000/N This is a multi-part message in MIME format. --------------0EF110BFD41656CB2CD303A1 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Make on OS/390 USS had a problem with how it handled macros in the make invocation. This patch removes the workaround that was put in the port of the Apache HTTP Server to OS/390 USS. The OS/390 APAR and fix information follows: APAR number is OW41216. It was fixed for releases V2R7 through V2R9 of OS/390 based on the fix information below: FIX INFORMATION: Reported release thought to contain the error: R607 Applicable Component Levels: R607 PSY UW66019 UP00/01/12 P F001 R608 PSY UW66020 UP00/01/12 P F001 R609 PSY UW66021 UP00/01/12 P F001 APAR is fixed by one or more of the following PTFs: UW66019 UW66020 UW66021 APAR is sysrouted FROM one or more of the following items: APAR is sysrouted TO one or more of the following items: UW66019 UW66020 UW66021 OW44128 --------------0EF110BFD41656CB2CD303A1 Content-Type: text/plain; charset=us-ascii; name="os390MakeFix.diff" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="os390MakeFix.diff" ? apache-1.3/cgi-src ? apache-1.3/htdocs/manual/info ? apache-1.3/src/os/emx Index: apache-1.3/src/Configure =================================================================== RCS file: /home/cvs/apache-1.3/src/Configure,v retrieving revision 1.397 diff -u -r1.397 Configure --- apache-1.3/src/Configure 2000/04/18 19:26:28 1.397 +++ apache-1.3/src/Configure 2000/05/30 17:07:01 @@ -2290,10 +2290,7 @@ @for i in \$(MODULES) ""; do \\ if [ "x\$\$i" != "x" ]; then \\ echo "===> \$(SDP)modules/\$\$i"; \\ - case "x\$(OS)" in \\ - xOS390 | xTPF) (cd \$\$i && \$(MAKE) SDP='\$(SDP)' \$@) || exit 1;; \\ - *) (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1;; \\ - esac; \\ + (cd \$\$i && \$(MAKE) \$(MFLAGS_STATIC) SDP='\$(SDP)' CC='\$(CC)' AUX_CFLAGS='\$(CFLAGS)' RANLIB='\$(RANLIB)' \$@) || exit 1; \\ echo "<=== \$(SDP)modules/\$\$i"; \\ fi; \\ done Index: apache-1.3/src/Makefile.tmpl =================================================================== RCS file: /home/cvs/apache-1.3/src/Makefile.tmpl,v retrieving revision 1.115 diff -u -r1.115 Makefile.tmpl --- apache-1.3/src/Makefile.tmpl 1999/12/09 17:19:31 1.115 +++ apache-1.3/src/Makefile.tmpl 2000/05/30 17:07:01 @@ -63,10 +63,7 @@ subdirs: @for i in $(SUBDIRS); do \ echo "===> $(SDP)$$i"; \ - case ".$(OS)" in \ - .OS390 | .TPF) ( cd $$i && $(MAKE) SDP='$(SDP)' ) || exit 1;; \ - *) ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1;; \ - esac; \ + ( cd $$i && $(MAKE) $(MFLAGS_STATIC) SDP='$(SDP)' CC='$(CC)' AUX_CFLAGS='$(CFLAGS)' RANLIB='$(RANLIB)') || exit 1; \ echo "<=== $(SDP)$$i"; \ done --------------0EF110BFD41656CB2CD303A1--