folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Build on macosx. 

CVS patchset: 7701
CVS date: 2005/01/17 23:58:09
This commit is contained in:
jbj 2005-01-17 23:58:09 +00:00
parent cd3d87df20
commit 217c588baa
38 changed files with 135 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -23,6 +23,7 @@ INCLUDES = \
-I$(top_srcdir)/rpmio \
@WITH_BEECRYPT_INCLUDE@ \
-I$(top_srcdir)/popt \
-I$(top_srcdir)/misc \
@WITH_LIBELF_INCLUDE@ \
@INCPATH@
@ -36,7 +37,6 @@ myLDADD = \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/popt/libpopt.la \
@WITH_ZLIB_LIB@ \
@INTLLIBS@ \
@LIBMISC@
rpmbindir = `echo $(bindir) | sed -e s,usr/bin,bin,`

23
autogen.sh
View File

@ -16,9 +16,24 @@ checked if you need to, as rpm should build (and has built) with all
recent versions of libtool/autoconf/automake.
"
[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1
libtoolize=`which glibtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=`which libtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=libtoolize
esac
esac
[ "`$libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1
[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1
[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1
[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" # && exit 1
if [ X"$@" = X -a "X`uname -s`" = "XDarwin" -a -d /opt/local ]; then
export myprefix=/opt/local
export CPPFLAGS="-I${myprefix}/include"
fi
if [ -d popt ]; then
(echo "--- popt"; cd popt; ./autogen.sh --noconfigure "$@")
@ -37,7 +52,7 @@ if [ -d file ]; then
fi
echo "--- rpm"
libtoolize --copy --force
$libtoolize --copy --force
aclocal
autoheader
automake -a -c
@ -62,5 +77,5 @@ if [ X"$@" = X -a "X`uname -s`" = "XLinux" ]; then
fi
./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --infodir=${infodir} --mandir=${mandir} ${enable_posixmutexes} "$@"
else
./configure "$@"
./configure --prefix=${myprefix} "$@"
fi

1
build/Makefile.am
View File

@ -12,6 +12,7 @@ INCLUDES = -I. \
@WITH_BEECRYPT_INCLUDE@ \
-I$(top_srcdir)/file/src \
-I$(top_srcdir)/popt \
-I$(top_srcdir)/misc \
@WITH_LIBELF_INCLUDE@ \
@INCPATH@

25
configure.ac
View File

@ -110,14 +110,17 @@ dnl LDFLAGS_STATIC="-all"
dnl to attempt static executables using libtool. Otherwise
dnl LDFLAGS_STATIC=""
dnl
with_selinuxval=no
AC_MSG_CHECKING(flag used by libtool to link rpm)
if test X"$GCC" = Xyes ; then
case "$target" in
*-*-linux*) LDFLAGS_STATIC="-all-static"
with_selinuxval=yes ;;
*-*-solaris*) LDFLAGS_STATIC="-static";;
*-*-hpux*) LDFLAGS_STATIC="-static";;
*-*-darwin*) LDFLAGS_STATIC="";; # Mac OS X does not do static binaries.
*-*-sysv5uw*) LDFLAGS_STATUS="-static";; # Unixware has no shared libthread.
*-*-*) LDFLAGS_STATIC="-all-static";;
*-*-*) LDFLAGS_STATIC="";;
esac
elif test X"$CC" = Xcc ; then
case "$target" in
@ -130,7 +133,7 @@ elif test X"$CC" = Xcc ; then
*-*-irix*) LDFLAGS_STATIC="-static";; #should be -non_shared, but can't
# link because of crt1.o then.
*-*-ultrix*) LDFLAGS_STATIC="-all-static";; #ultrix doesn't have shared libs.
*-*-*) LDFLAGS_STATIC="-static"
*-*-*) LDFLAGS_STATIC=""
AC_MSG_WARN([
Unable to guess what option to pass to $CC to generate a static
@ -346,7 +349,7 @@ do
AC_MSG_CHECKING(for $dir/include in INCPATH)
if test -d $dir/include 2>/dev/null ; then
if [ "$dir" != "/usr/local" ] ; then
if [[ "$dir" != "/usr/local" ]] ; then
INCPATH="$INCPATH -I$dir/include"
fi
AC_MSG_RESULT(yes)
@ -400,15 +403,19 @@ AC_SUBST(WITH_LIBELF_INCLUDE)
AC_SUBST(WITH_LIBELF_LIB)
WITH_LIBDWARF_INCLUDE=
WITH_LIBDWARF_DEBUGEDIT=
AC_CHECK_HEADER([dwarf.h], [
AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
WITH_LIBDWARF_DEBUGEDIT="debugedit"
], [
if test -d elfutils/libdwarf ; then
AC_DEFINE(HAVE_DWARF_H, 1, [Define to 1 if you have the <dwarf.h> header file.])
WITH_LIBDWARF_INCLUDE="-I\${top_srcdir}/${WITH_ELFUTILS_SUBDIR}/libdwarf"
WITH_LIBDWARF_DEBUGEDIT="debugedit"
fi
])
AC_SUBST(WITH_LIBDWARF_INCLUDE)
AC_SUBST(WITH_LIBDWARF_DEBUGEDIT)
#=================
# Check for beecrypt library. Prefer external, otherwise internal.
@ -421,7 +428,7 @@ AC_CHECK_HEADER([beecrypt/beecrypt.h], [
AC_CHECK_HEADER([beecrypt/api.h], [
AC_DEFINE(HAVE_BEECRYPT_API_H, 1, [Define to 1 if you have the <beecrypt/api.h> header file.])
])
WITH_BEECRYPT_INCLUDE="-I/usr/include/beecrypt"
WITH_BEECRYPT_INCLUDE="-I${includedir}/beecrypt"
WITH_BEECRYPT_LIB="-lbeecrypt"
])
], [
@ -447,7 +454,7 @@ AC_CHECK_HEADER([neon/ne_session.h], [
AC_CHECK_LIB(neon, ne_get_response_header, [
AC_DEFINE(HAVE_NEON_NE_GET_RESPONSE_HEADER, 1, [Define to 1 if you have ne_get_response_header() in libneon.])
])
WITH_NEON_INCLUDE="-I/usr/include/neon"
WITH_NEON_INCLUDE="-I${includedir}/neon"
WITH_NEON_LIB="-lneon"
])
], [
@ -556,9 +563,9 @@ dnl TVM:
dnl horrible *temporary* hack to make sure that if we found gettext() in
dnl -lintl that we add -lintl *back* to $LIBS.
dnl
if test X$gt_cv_func_gettext_libintl = Xyes ; then
LIBS="-lintl $LIBS"
fi
dnl if test X$gt_cv_func_gettext_libintl = Xyes ; then
dnl LIBS="-lintl $LIBS"
dnl fi
dnl Checks for header files we can live without.
AC_HEADER_STDC
@ -922,7 +929,7 @@ elif test $withval = yes -a $__DOXYGEN = no ; then
fi
WITH_SELINUX_LIB=
withval=yes
withval=${with_selinuxval}
AC_ARG_WITH(selinux, [ --with-selinux build with selinux support ])
if test $withval != no ; then
AC_DEFINE(WITH_SELINUX, 1, [Build with selinux support?])

3
db/dist/configure vendored
View File

@ -33801,7 +33801,8 @@ echo "${ECHO_T}yes" >&6
-e 's/return;//' \
-e 's/^}/__dbsrv_timeout(0);}/' \
-e '}' \
-e '1,/^#include/s/^#include/#include "db_config.h"\n#include "db_int_def.h"\
-e '1,/^#include/s/^#include/#include "db_config.h"\
#include "db_int_def.h"\
&/' > db_server_svc.c
$RPCGEN -c $XDR_FILE |

18
file/autogen.sh
View File

@ -16,11 +16,21 @@ checked if you need to, as rpm should build (and has built) with all
recent versions of libtool/autoconf/automake.
"
[ "`libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1
[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1
[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" && exit 1
libtoolize=`which glibtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=`which libtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=libtoolize
esac
esac
libtoolize --copy --force
[ "`$libtoolize --version | head -1`" != "$LTV" ] && echo "$USAGE" && exit 1
[ "`autoconf --version | head -1`" != "$ACV" ] && echo "$USAGE" && exit 1
[ "`automake --version | head -1 | sed -e 's/1\.4[a-z]/1.4/'`" != "$AMV" ] && echo "$USAGE" # && exit 1
$libtoolize --copy --force
aclocal
autoheader
automake -a -c

4
lib/Makefile.am
View File

@ -11,6 +11,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/rpmio \
@WITH_BEECRYPT_INCLUDE@ \
-I$(top_srcdir)/popt \
-I$(top_srcdir)/misc \
@INCPATH@
EXTRA_DIST = getdate.y tgi.c rpmgi.c rpmgi.h
@ -44,7 +45,8 @@ librpm_la_LDFLAGS = -release 4.4 $(LDFLAGS) \
$(top_builddir)/rpmdb/librpmdb.la \
$(top_builddir)/rpmio/librpmio.la \
$(top_builddir)/popt/libpopt.la \
@WITH_SELINUX_LIB@
@WITH_SELINUX_LIB@ \
@INTLLIBS@
getdate.c: getdate.y
@echo expect 10 shift/reduce conflicts

6
lib/formats.c
View File

@ -980,10 +980,12 @@ static int filerequireTag(Header h, /*@out@*/ rpmTagType * type,
/* I18N look aside diversions */
#if defined(ENABLE_NLS)
/*@-exportlocal -exportheadervar@*/
/*@unchecked@*/
int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */
extern int _nl_msg_cat_cntr; /* XXX GNU gettext voodoo */
/*@=exportlocal =exportheadervar@*/
#endif
/*@observer@*/ /*@unchecked@*/
static const char * language = "LANGUAGE";
@ -1035,7 +1037,9 @@ static int i18nTag(Header h, int_32 tag, /*@out@*/ rpmTagType * type,
/* change to en_US for msgkey -> msgid resolution */
langval = getenv(language);
(void) setenv(language, "en_US", 1);
#if defined(ENABLE_NLS)
/*@i@*/ ++_nl_msg_cat_cntr;
#endif
msgid = NULL;
/*@-branchstate@*/

1
lib/poptALL.c
View File

@ -4,6 +4,7 @@
*/
#include "system.h"
const char *__progname;
#include <rpmcli.h>
#include <fts.h>

7
lib/rpmrc.c
View File

@ -1131,6 +1131,13 @@ static void defaultMachine(/*@out@*/ const char ** arch,
strcpy(un.machine, __power_pc() ? "ppc" : "rs6000");
sprintf(un.sysname,"aix%s.%s", un.version, un.release);
}
else if(!strcmp(un.sysname, "Darwin")) {
#ifdef __ppc__
strcpy(un.machine, "ppc");
#else ifdef __i386__
strcpy(un.machine, "i386");
#endif
}
else if (!strcmp(un.sysname, "SunOS")) {
if (!strncmp(un.release,"4", 1)) /* SunOS 4.x */ {
int fd;

2
lua/Makefile.am
View File

@ -12,7 +12,7 @@ EXTRA_DIST = \
local/linit.lua
LDADD = liblua.la
INCLUDES = -I$(srcdir)/include -I$(srcdir)/local
INCLUDES = -I$(srcdir)/include -I$(srcdir)/local -I$(includedir)
lua_lua_SOURCES = lua/lua.c
lua_lua_CFLAGS = -DLUA_USERCONFIG='"$(srcdir)/local/userconfig.c"'

2
misc/glob.h
View File

@ -46,7 +46,7 @@ extern "C" {
#endif /* C++ or ANSI C. */
/* We need `size_t' for the following definitions. */
#ifndef __size_t
#if !defined(__size_t) && !defined(_BSD_SIZE_T_DEFINED_)
# if defined __GNUC__ && __GNUC__ >= 2
typedef __SIZE_TYPE__ __size_t;
# ifdef _XOPEN_SOURCE

2
popt/Makefile.am
View File

@ -37,7 +37,9 @@ include_HEADERS = popt.h
usrlibdir = $(libdir)@MARK64@
usrlib_LTLIBRARIES = libpopt.la
libpopt_la_SOURCES = popt.c findme.c poptparse.c poptconfig.c popthelp.c
libpopt_la_LDFLAGS = @INTLLIBS@
man_MANS = popt.3

12
popt/autogen.sh
View File

@ -5,8 +5,18 @@ test -z "$srcdir" && srcdir=.
THEDIR="`pwd`"
libtoolize=`which glibtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=`which libtoolize 2>/dev/null`
case $libtoolize in
/*) ;;
*) libtoolize=libtoolize
esac
esac
cd "$srcdir"
libtoolize --copy --force
$libtoolize --copy --force
aclocal
autoheader
automake -a -c

2
python/header-py.h
View File

@ -14,7 +14,7 @@ extern PyTypeObject hdr_Type;
/** \ingroup py_c
*/
PyObject * pyrpmError;
extern PyObject * pyrpmError;
hdrObject * hdr_Wrap(Header h)
/*@*/;

4
python/rpmmodule.c
View File

@ -37,6 +37,10 @@
*/
/*@{*/
/**
*/
PyObject * pyrpmError;
/**
*/
static PyObject * archScore(PyObject * self, PyObject * args, PyObject * kwds)

1
rpm2cpio.c
View File

@ -1,6 +1,7 @@
/* rpmarchive: spit out the main archive portion of a package */
#include "system.h"
const char *__progname;
#include <rpmlib.h>
#include <rpmpgp.h>

1
rpmdb/Makefile.am
View File

@ -11,6 +11,7 @@ INCLUDES = -I. \
-I$(top_srcdir)/rpmio \
@WITH_BEECRYPT_INCLUDE@ \
-I$(top_srcdir)/popt \
-I$(top_srcdir)/misc \
@WITH_LIBELF_INCLUDE@ \
@INCPATH@

3
rpmio/Makefile.am
View File

@ -13,6 +13,7 @@ INCLUDES = -I. \
@WITH_BEECRYPT_INCLUDE@ \
@WITH_LUA_INCLUDE@ \
-I$(top_srcdir)/popt \
-I$(top_srcdir)/misc \
@INCPATH@
pkgincdir = $(pkgincludedir)
@ -37,7 +38,7 @@ librpmio_la_LDFLAGS = -release 4.4 $(LDFLAGS) \
@WITH_LUA_LIB@ \
$(top_builddir)/file/src/libmagic.la \
@WITH_ZLIB_LIB@ \
-lneon -lrt -lpthread
-lneon -lpthread
librpmio_la_LIBADD = # $(BEECRYPTLOBJS)
librpmio_la_DEPENDENCIES = # .created

6
rpmio/fts.c
View File

@ -59,6 +59,12 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
#endif
#if defined(__APPLE__)
# define __errno_location() (__error())
# define stat64 stat
# define _STAT_VER 0
# define __fxstat64(_stat_ver, _fd, _sbp) fstat((_fd), (_sbp))
#endif
#include "system.h"
#include "fts.h"
#include "rpmio.h"

4
rpmio/fts.h
View File

@ -55,6 +55,10 @@
# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
#endif
#if defined(__APPLE__)
# define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
#endif
#endif
#include <sys/types.h>

4
rpmio/rpmdav.c
View File

@ -1406,7 +1406,9 @@ struct dirent * avReaddir(DIR * dir)
dp->d_reclen = 0; /* W2DO? */
#if !defined(hpux) && !defined(sun)
#if !defined(__APPLE__)
dp->d_off = 0; /* W2DO? */
#endif
/*@-boundsread@*/
dp->d_type = dt[i];
/*@=boundsread@*/
@ -1528,7 +1530,9 @@ struct dirent * davReaddir(DIR * dir)
dp->d_reclen = 0; /* W2DO? */
#if !defined(hpux) && !defined(sun)
#if !defined(__APPLE__)
dp->d_off = 0; /* W2DO? */
#endif
/*@-boundsread@*/
dp->d_type = dt[i];
/*@=boundsread@*/

2
rpmio/rpmdav.h
View File

@ -17,7 +17,7 @@ struct __dirstream {
};
#endif
#if !defined(DT_DIR)
#if !defined(DT_DIR) || defined(__APPLE__)
# define DT_UNKNOWN 0
# define DT_FIFO 1
# define DT_CHR 2

2
rpmio/rpmio.h
View File

@ -10,7 +10,7 @@
#include <sys/stat.h>
#include <dirent.h>
/*@-noparams@*/
#include <glob.h>
#include "glob.h"
/*@=noparams@*/
#include <stdio.h>
#include <stdlib.h>

1
rpmqv.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#define _AUTOHELP

2
system.h
View File

@ -448,7 +448,7 @@ extern void muntrace (void)
}
#endif
/*@unchecked@*/
const char *__progname;
extern const char *__progname;
#if HAVE_NETDB_H
#include <netdb.h>

20
tools/Makefile.am
View File

@ -13,24 +13,22 @@ INCLUDES = -I. \
@WITH_LIBELF_INCLUDE@ \
@WITH_LIBDWARF_INCLUDE@ \
-I$(top_srcdir)/file/src \
@INCPATH@ \
-I/usr/include/libxml2
-I$(top_srcdir)/misc
-I$(top_srcdir)/misc \
@INCPATH@
EXTRA_DIST = rpminject.c rpmsort.c rpmxml.c rpmxp.c rpmxp.h hashtab.h
EXTRA_PROGRAMS = convertdb1 rpminject rpmsort rpmtool rpmxml
EXTRA_PROGRAMS = debugedit convertdb1 rpminject rpmsort rpmtool rpmxml
LDADD = \
$(top_builddir)/lib/librpm.la \
@INTLLIBS@
$(top_builddir)/lib/librpm.la
staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
noinst_PROGRAMS = dumpdb
pkgbindir = @RPMCONFIGDIR@
pkgbin_PROGRAMS = debugedit javadeps rpmcache rpmdeps rpmfile
pkgbin_PROGRAMS = @WITH_LIBDWARF_DEBUGEDIT@ javadeps rpmcache rpmdeps rpmfile
MAGIC = $(pkgbindir)/magic
bin_PROGRAMS = rpmgraph
@ -44,11 +42,11 @@ debugedit_LDADD = @LDFLAGS_STATIC@ @WITH_LIBELF_LIB@ \
javadeps_SOURCES = javadeps.c
rpmcache_SOURCES = rpmcache.c
#rpmcache_LDFLAGS = $(staticLDFLAGS)
#rpmcache_LDFLAGS = -L$(libdir) # $(staticLDFLAGS)
rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la
#rpmdeps_LDFLAGS = $(staticLDFLAGS)
rpmdeps_LDADD = $(top_builddir)/build/librpmbuild.la
rpmfile.c: $(top_srcdir)/file/src/file.c
rm -f $@
@ -66,13 +64,15 @@ rpminject_SOURCES = rpminject.c
#rpminject_LDFLAGS = $(staticLDFLAGS)
rpmsort_SOURCES = rpmsort.c
#rpmsort_LDFLAGS = $(staticLDFLAGS)
#rpmsort_LDFLAGS = (staticLDFLAGS)
rpmtool_SOURCES = rpmtool.c rpmxp.c
rpmtool_CFLAGS = -I$(includedir)/libxml2
#rpmtool_LDFLAGS = $(staticLDFLAGS)
rpmtool_LDADD = $(LDADD) -lxml2
rpmxml_SOURCES = rpmxml.c # rpmxp.c
rpmxml_CFLAGS = -I$(includedir)/libxml2
#rpmxml_LDFLAGS = $(staticLDFLAGS)
rpmxml_LDADD = $(LDADD) -lxml2

1
tools/convertdb1.c
View File

@ -1,5 +1,6 @@
#if defined(HAVE_CONFIG_H)
#include "system.h"
const char *__progname;
#else
#include <sys/types.h>
#include <fcntl.h>

1
tools/dump.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include <rpmlib.h>
#include "header_internal.h"

1
tools/dumpdb.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include <rpmlib.h>
#include "header_internal.h"

2
tools/rpmcache.c
View File

@ -3,6 +3,8 @@
*/
#include "system.h"
const char *__progname;
#include <fnmatch.h>
#include <fts.h>

1
tools/rpmdeps.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include <rpmbuild.h>
#include <argv.h>

1
tools/rpmgraph.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include <rpmcli.h>

1
tools/rpminject.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include "rpmbuild.h"
#include "buildio.h"

1
tools/rpmsort.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include <rpmlib.h>
#include <rpmmacro.h>

1
tools/rpmtool.c
View File

@ -1,4 +1,5 @@
#include "system.h"
const char *__progname;
#include <rpmcli.h>
#include <rpmxp.h>

2
tools/rpmxml.c
View File

@ -1,4 +1,6 @@
#include "system.h"
const char *__progname;
#include <rpmlib.h>
#define _RPMXP_INTERNAL
#include "rpmxp.h"

2
tools/rpmxp.c
View File

@ -1,4 +1,6 @@
#include "system.h"
const char *__progname;
#include <header.h>
#define _RPMXP_INTERNAL
#include "rpmxp.h"