RPM Community Forums

Mailing List Message of <rpm-cvs>

[CVS] RPM: rpm-4_5: file/src/ Makefile.am zlib/ Makefile.am

From: Per Øyvind Karlsen <pkarlsen@rpm5.org>
Date: Mon 10 Dec 2007 - 16:00:54 CET
Message-Id: <20071210150054.B14D3348450@rpm5.org>
  RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarlsen@rpm5.org
  Module: file zlib                        Date:   10-Dec-2007 16:00:54
  Branch: rpm-4_5                          Handle: 2007121015005400

  Modified files:           (Branch: rpm-4_5)
    file/src                Makefile.am
    zlib                    Makefile.am

  Log:
    force generation of PIC code for static libs that can be built into a
    DSO (zlib, file) (fixes x86_64 build, from Gwenole Beauchesne)

  Summary:
    Revision    Changes     Path
    1.24.2.2    +1  -0      file/src/Makefile.am
    1.21.2.2    +1  -0      zlib/Makefile.am
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: file/src/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.24.2.1 -r1.24.2.2 Makefile.am
  --- file/src/Makefile.am	27 Jul 2007 15:39:35 -0000	1.24.2.1
  +++ file/src/Makefile.am	10 Dec 2007 15:00:54 -0000	1.24.2.2
  @@ -22,6 +22,7 @@
   libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
   	compress.c is_tar.c readelf.c print.c fsmagic.c funcs.c apptype.c
   libmagic_la_LDFLAGS = -no-undefined -version-info 1:0:0
  +libmagic_la_CFLAGS  = -prefer-pic
   
   noinst_PROGRAMS = file
   file_SOURCES = file.c
  @@ .
  patch -p0 <<'@@ .'
  Index: zlib/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.21.2.1 -r1.21.2.2 Makefile.am
  --- zlib/Makefile.am	4 Sep 2007 02:04:20 -0000	1.21.2.1
  +++ zlib/Makefile.am	10 Dec 2007 15:00:54 -0000	1.21.2.2
  @@ -15,6 +15,7 @@
   	adler32.c compress.c crc32.c deflate.c gzio.c \
   	infback.c inffast.c inflate.c inftrees.c \
   	trees.c uncompr.c zutil.c
  +libz_la_CFLAGS = -prefer-pic
   
   # Don't uncomment the following line or make -jX will break
   # noinst_PROGRAMS = example minigzip
  @@ .
Received on Mon Dec 10 16:00:54 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.