Browse Source

* Compilation fixes and portability improvement for compiling APT against non-GNU libc

tags/debian/0.7.21
Luca Bruno 13 years ago
parent
commit
8cd53bd4fe
6 changed files with 35 additions and 17 deletions
  1. +2
    -0
      buildlib/apti18n.h.in
  2. +7
    -0
      buildlib/inttypes.h.in
  3. +6
    -6
      cmdline/makefile
  4. +9
    -0
      debian/changelog
  5. +1
    -1
      ftparchive/makefile
  6. +10
    -10
      methods/makefile

+ 2
- 0
buildlib/apti18n.h.in View File

@@ -18,6 +18,8 @@
#else
// apt will not use any gettext
# define setlocale(a, b)
# define textdomain(a)
# define bindtextdomain(a, b)
# define _(x) x
# define N_(x) x
#endif

+ 7
- 0
buildlib/inttypes.h.in View File

@@ -4,6 +4,13 @@

#include <config.h>

#undef int32_t
#undef uint32_t
#undef int16_t
#undef uint16_t
#undef int8_t
#undef uint8_t

/* Generate the fixed bit size types */
#if SIZEOF_INT == 4
typedef int int32_t;


+ 6
- 6
cmdline/makefile View File

@@ -7,42 +7,42 @@ include ../buildlib/defaults.mak

# The apt-cache program
PROGRAM=apt-cache
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-cache.cc
include $(PROGRAM_H)

# The apt-get program
PROGRAM=apt-get
SLIBS = -lapt-pkg -lutil
SLIBS = -lapt-pkg -lutil $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-get.cc acqprogress.cc
include $(PROGRAM_H)

# The apt-config program
PROGRAM=apt-config
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-config.cc
include $(PROGRAM_H)

# The apt-cdrom program
PROGRAM=apt-cdrom
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-cdrom.cc
include $(PROGRAM_H)

# The apt-sortpkgs program
PROGRAM=apt-sortpkgs
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-sortpkgs.cc
include $(PROGRAM_H)

# The apt-extracttemplates program
PROGRAM=apt-extracttemplates
SLIBS = -lapt-pkg -lapt-inst
SLIBS = -lapt-pkg -lapt-inst $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = apt-extracttemplates.cc
include $(PROGRAM_H)


+ 9
- 0
debian/changelog View File

@@ -4,6 +4,15 @@ apt (0.7.17~exp1) UNRELEASED; urgency=low
* Fix compilation warnings:
- apt-pkg/acquire.cc
- apt-pkg/versionmatch.cc
* Compilation fixes and portability improvement for compiling APT against non-GNU libc
(thanks to Martin Koeppe, closes: #392063):
- buildlib/apti18n.h.in:
+ textdomain() and bindtextdomain() must not be visible when --disable-nls
- buildlib/inttypes.h.in: undefine standard int*_t types
- Append INTLLIBS to SLIBS:
+ cmdline/makefile
+ ftparchive/makefile
+ methods/makefile

-- Luca Bruno <lethalman88@gmail.com> Sat, 11 Oct 2008 09:17:46 +0200



+ 1
- 1
ftparchive/makefile View File

@@ -8,7 +8,7 @@ include ../buildlib/defaults.mak
# The apt-ftparchive program
ifdef BDBLIB
PROGRAM=apt-ftparchive
SLIBS = -lapt-pkg -lapt-inst $(BDBLIB)
SLIBS = -lapt-pkg -lapt-inst $(BDBLIB) $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile apt-inst/makefile
SOURCE = apt-ftparchive.cc cachedb.cc writer.cc contents.cc override.cc \
multicompress.cc


+ 10
- 10
methods/makefile View File

@@ -12,70 +12,70 @@ APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)

# The file method
PROGRAM=file
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = file.cc
include $(PROGRAM_H)

# The copy method
PROGRAM=copy
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = copy.cc
include $(PROGRAM_H)

# The gzip method
PROGRAM=gzip
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = gzip.cc
include $(PROGRAM_H)

# The gpgv method
PROGRAM=gpgv
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = gpgv.cc
include $(PROGRAM_H)

# The cdrom method
PROGRAM=cdrom
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = cdrom.cc
include $(PROGRAM_H)

# The http method
PROGRAM=http
SLIBS = -lapt-pkg $(SOCKETLIBS)
SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = http.cc rfc2553emu.cc connect.cc
include $(PROGRAM_H)

# The https method
PROGRAM=https
SLIBS = -lapt-pkg -lcurl
SLIBS = -lapt-pkg -lcurl $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = https.cc
include $(PROGRAM_H)

# The ftp method
PROGRAM=ftp
SLIBS = -lapt-pkg $(SOCKETLIBS)
SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = ftp.cc rfc2553emu.cc connect.cc
include $(PROGRAM_H)

# The rred method
PROGRAM=rred
SLIBS = -lapt-pkg $(SOCKETLIBS)
SLIBS = -lapt-pkg $(SOCKETLIBS) $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = rred.cc
include $(PROGRAM_H)

# The rsh method
PROGRAM=rsh
SLIBS = -lapt-pkg
SLIBS = -lapt-pkg $(INTLLIBS)
LIB_MAKES = apt-pkg/makefile
SOURCE = rsh.cc
include $(PROGRAM_H)


Loading…
Cancel
Save