Snapshot 26Feb98 - another minor showstopper

Started by Andrew Martinalmost 28 years ago4 messages
#1Andrew Martin
martin@biochemistry.ucl.ac.uk

The Makefile in .../src/interfaces/ecpg/lib/ uses a gcc specific flag
(-Wall) instead of COPTS.

The following patch is for Makefile.in in that directory

*** Makefile.in.orig    Tue Feb 24 08:00:41 1998
--- Makefile.in Thu Feb 26 16:27:16 1998
***************
*** 61,66 ****
  libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)
  ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
!       $(CC) -Wall -I../include $(PQ_INCLUDE) -c ecpglib.c
  typename.o : typename.c ../include/ecpgtype.h
!       $(CC) -Wall -I../include $(PQ_INCLUDE) -c typename.c
--- 61,66 ----
  libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)

ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
! $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c ecpglib.c
typename.o : typename.c ../include/ecpgtype.h
! $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c typename.c

I guess (I haven't had time to check) that the actual Makefile is built
from Makefile.in. If not, then an equivalent patch needs to be applied
to Makefile

Andrew

----------------------------------------------------------------------------
Dr. Andrew C.R. Martin University College London
EMAIL: (Work) martin@biochem.ucl.ac.uk (Home) andrew@stagleys.demon.co.uk
URL: http://www.biochem.ucl.ac.uk/~martin
Tel: (Work) +44(0)171 419 3890 (Home) +44(0)1372 275775

#2Andrew Martin
martin@biochemistry.ucl.ac.uk
In reply to: Andrew Martin (#1)
Re: [HACKERS] Snapshot 26Feb98 - another minor showstopper

Just seen that Darren has supplied more extensive patches which
also fix the problems with -Wall in ecpg

So, ignore my versions (though the patch to configure is still
needed).

Andrew
----------------------------------------------------------------------------
Dr. Andrew C.R. Martin University College London
EMAIL: (Work) martin@biochem.ucl.ac.uk (Home) andrew@stagleys.demon.co.uk
URL: http://www.biochem.ucl.ac.uk/~martin
Tel: (Work) +44(0)171 419 3890 (Home) +44(0)1372 275775

#3Tom I Helbekkmo
tih@Hamartun.Priv.NO
In reply to: Andrew Martin (#2)
Re: [HACKERS] Snapshot 26Feb98 - another minor showstopper

On Thu, Feb 26, 1998 at 05:15:28PM +0000, Andrew Martin wrote:

Just seen that Darren has supplied more extensive patches which
also fix the problems with -Wall in ecpg

So, ignore my versions (though the patch to configure is still
needed).

Not entirely. His version didn't introduce "$(CFLAGS)" into the cc
command lines, which is needed for many systems -- while yours did.
Specifically, this causes building to fail on systems that do shared
libraries. For the "bsd" port, the shared library setup should also
be modified as has been done everywhere else, to ignore it on those
BSD systems that don't have shared libraries.

Here's a slightly expanded version of your patch -- this is what I'm
using here now:

*** interfaces/ecpg/lib/Makefile.in.orig	Tue Feb 24 09:00:41 1998
--- interfaces/ecpg/lib/Makefile.in	Thu Feb 26 18:29:03 1998
***************
*** 8,13 ****
--- 8,17 ----

PORTNAME=@PORTNAME@

+ ifdef KRBVERS
+ CFLAGS+= $(KRBFLAGS)
+ endif
+ 
  # Shared library stuff
  shlib := 
  install-shlib-dep :=
***************
*** 20,29 ****
    endif
  endif
  ifeq ($(PORTNAME), bsd)
!   install-shlib-dep := install-shlib
!   shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
!   LDFLAGS_SL = -x -Bshareable -Bforcearchive
!   CFLAGS += $(CFLAGS_SL)
  endif
  #ifeq ($(PORTNAME), i386_solaris)
  #  install-shlib-dep := install-shlib
--- 24,35 ----
    endif
  endif
  ifeq ($(PORTNAME), bsd)
!   ifdef BSD_SHLIB
!     install-shlib-dep := install-shlib
!     shlib := libecpg.so.$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
!     LDFLAGS_SL = -x -Bshareable -Bforcearchive
!     CFLAGS += $(CFLAGS_SL)
!   endif
  endif
  #ifeq ($(PORTNAME), i386_solaris)
  #  install-shlib-dep := install-shlib
***************
*** 61,66 ****
  libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)
  ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
! 	$(CC) -Wall -I../include $(PQ_INCLUDE) -c ecpglib.c
  typename.o : typename.c ../include/ecpgtype.h
! 	$(CC) -Wall -I../include $(PQ_INCLUDE) -c typename.c
--- 67,72 ----
  libecpg.a : libecpg.a(ecpglib.o) libecpg.a(typename.o)

ecpglib.o : ecpglib.c ../include/ecpglib.h ../include/ecpgtype.h
! $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c ecpglib.c
typename.o : typename.c ../include/ecpgtype.h
! $(CC) $(CFLAGS) -I../include $(PQ_INCLUDE) -c typename.c

-tih
--
Popularity is the hallmark of mediocrity. --Niles Crane, "Frasier"

#4Michael Meskes
meskes@topsystem.de
In reply to: Tom I Helbekkmo (#3)
Re: [HACKERS] Snapshot 26Feb98 - another minor showstopper

Tom I Helbekkmo writes:

Not entirely. His version didn't introduce "$(CFLAGS)" into the cc
command lines, which is needed for many systems -- while yours did.
Specifically, this causes building to fail on systems that do shared
libraries. For the "bsd" port, the shared library setup should also
be modified as has been done everywhere else, to ignore it on those
BSD systems that don't have shared libraries.

Here's a slightly expanded version of your patch -- this is what I'm
using here now:

Okay, will be included with my next patch set.

Michael
--
Dr. Michael Meskes, Project-Manager | topsystem Systemhaus GmbH
meskes@topsystem.de | Europark A2, Adenauerstr. 20
meskes@debian.org | 52146 Wuerselen
Go SF49ers! Go Rhein Fire! | Tel: (+49) 2405/4670-44
Use Debian GNU/Linux! | Fax: (+49) 2405/4670-10