apt: unbreak 0.6.46.2 build (based on OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1574 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Marcin Juszkiewicz
parent
16737be21f
commit
4ae5c57280
|
|
@ -1,84 +0,0 @@
|
|||
|
||||
#
|
||||
# Patch managed by http://www.holgerschurig.de/patcher.html
|
||||
#
|
||||
|
||||
---
|
||||
configure.in | 20 ++++++++++----------
|
||||
1 file changed, 10 insertions(+), 10 deletions(-)
|
||||
|
||||
--- apt-0.6.45exp2.orig/configure.in
|
||||
+++ apt-0.6.45exp2/configure.in
|
||||
@@ -18,9 +18,9 @@ AC_CONFIG_AUX_DIR(buildlib)
|
||||
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
|
||||
|
||||
dnl -- SET THIS TO THE RELEASE VERSION --
|
||||
-AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2")
|
||||
+AC_DEFINE_UNQUOTED(VERSION,"0.6.45exp2",[package version])
|
||||
PACKAGE="apt"
|
||||
-AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
|
||||
+AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE",[package name])
|
||||
AC_SUBST(PACKAGE)
|
||||
|
||||
dnl Check the archs, we want the target type.
|
||||
@@ -47,7 +47,7 @@ AC_SUBST(SOCKETLIBS)
|
||||
LIBS="$SAVE_LIBS"
|
||||
|
||||
dnl Checks for pthread -- disabled due to glibc bugs jgg
|
||||
-dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD) PTHREADLIB="-lpthread"])
|
||||
+dnl AC_CHECK_LIB(pthread, pthread_create,[AC_DEFINE(HAVE_PTHREAD, 1, [define if we have pthreads]) PTHREADLIB="-lpthread"])
|
||||
AC_SUBST(PTHREADLIB)
|
||||
dnl if test "$PTHREADLIB" != "-lpthread"; then
|
||||
dnl AC_MSG_ERROR(failed: I need posix threads, pthread)
|
||||
@@ -84,14 +84,14 @@ if test "x$archset" = "x"; then
|
||||
AC_MSG_ERROR(failed: use --host= or check buildlib/archtable)
|
||||
fi
|
||||
AC_MSG_RESULT($archset)
|
||||
-AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset")
|
||||
+AC_DEFINE_UNQUOTED(COMMON_CPU,"$archset",[define to the system architecture])
|
||||
|
||||
dnl Get a common name for the host OS - this is primarily only for HURD and is
|
||||
dnl non fatal if it fails
|
||||
AC_MSG_CHECKING(system OS)
|
||||
osset="`awk \" ! /^#|^\\\$/ {if (match(\\\"$target_vendor-$target_os\\\",\\\$1)) {print \\\$2; exit}}\" $srcdir/buildlib/ostable`"
|
||||
AC_MSG_RESULT($osset)
|
||||
-AC_DEFINE_UNQUOTED(COMMON_OS,"$osset")
|
||||
+AC_DEFINE_UNQUOTED(COMMON_OS,"$osset",[define to the system OS])
|
||||
|
||||
dnl We use C99 types if at all possible
|
||||
AC_CACHE_CHECK([for C99 integer types],c9x_ints,[
|
||||
@@ -105,13 +105,13 @@ AC_SUBST(HAVE_STATVFS)
|
||||
|
||||
dnl Arg, linux and bsd put their statfs function in different places
|
||||
if test x"$HAVE_STATVFS" != x"yes"; then
|
||||
- AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H)],[
|
||||
- AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H)],[AC_MSG_ERROR(failed: Need statvfs)])
|
||||
+ AC_EGREP_HEADER(statfs,sys/vfs.h,[AC_DEFINE(HAVE_VFS_H, 1, [define if statfs is in sys/vfs.h])],[
|
||||
+ AC_EGREP_HEADER(statfs,sys/mount.h,[AC_DEFINE(HAVE_MOUNT_H, 1, [define if statfs is in sys/mount.h])],[AC_MSG_ERROR(failed: Need statvfs)])
|
||||
])
|
||||
fi
|
||||
|
||||
dnl We should use the real timegm function if we have it.
|
||||
-AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM))
|
||||
+AC_CHECK_FUNC(timegm,AC_DEFINE(HAVE_TIMEGM, 1, [define if we have timegm]))
|
||||
AC_SUBST(HAVE_TIMEGM)
|
||||
|
||||
dnl Check the sizes etc. of the architecture
|
||||
@@ -157,7 +157,7 @@ fi
|
||||
dnl HP-UX sux..
|
||||
AC_MSG_CHECKING(for missing socklen_t)
|
||||
AC_EGREP_HEADER(socklen_t, sys/socket.h,[AC_MSG_RESULT(no)],[
|
||||
- AC_DEFINE(NEED_SOCKLEN_T_DEFINE)
|
||||
+ AC_DEFINE(NEED_SOCKLEN_T_DEFINE, 1, [define if we need to define socklen_t])
|
||||
NEED_SOCKLEN_T_DEFINE=yes
|
||||
AC_MSG_RESULT(missing.)])
|
||||
AC_SUBST(NEED_SOCKLEN_T_DEFINE)
|
||||
@@ -204,7 +204,7 @@ dnl gettext approved makefiles, so this
|
||||
ALL_LINGUAS="bg bs ca cs cy da de dz el en_GB es eu fi fr gl hu it ja ko nb nl nn pl pt_BR pt ro ru sk sl sv tl vi zn_CN zh_TW"
|
||||
AM_GNU_GETTEXT(external)
|
||||
if test x"$USE_NLS" = "xyes"; then
|
||||
- AC_DEFINE(USE_NLS)
|
||||
+ AC_DEFINE(USE_NLS, 1, [define if we have native language support])
|
||||
fi
|
||||
AC_SUBST(USE_NLS)
|
||||
AC_PATH_PROG(BASH, bash)
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
---
|
||||
apt-pkg/packagemanager.cc | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- apt-0.6.45exp2.orig/apt-pkg/packagemanager.cc
|
||||
+++ apt-0.6.45exp2/apt-pkg/packagemanager.cc
|
||||
@@ -534,10 +534,12 @@ bool pkgPackageManager::SmartUnPack(PkgI
|
||||
|
||||
List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
|
||||
|
||||
+#if 0
|
||||
// Perform immedate configuration of the package.
|
||||
if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
|
||||
if (SmartConfigure(Pkg) == false)
|
||||
return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
|
||||
+#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -609,6 +611,7 @@ pkgPackageManager::OrderResult pkgPackag
|
||||
DoneSomething = true;
|
||||
}
|
||||
|
||||
+#if 0
|
||||
// Final run through the configure phase
|
||||
if (ConfigureAll() == false)
|
||||
return Failed;
|
||||
@@ -623,6 +626,7 @@ pkgPackageManager::OrderResult pkgPackag
|
||||
return Failed;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
return Completed;
|
||||
}
|
||||
|
|
@ -1,11 +1,23 @@
|
|||
DESCRIPTION = "Advanced front-end for dpkg."
|
||||
LICENSE = "GPL"
|
||||
SECTION = "base"
|
||||
PR = "r1"
|
||||
|
||||
SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz"
|
||||
SRC_URI = "${DEBIAN_MIRROR}/main/a/apt/apt_${PV}.tar.gz \
|
||||
file://environment.patch;patch=1"
|
||||
S = "${WORKDIR}/apt-${PV}"
|
||||
|
||||
inherit autotools gettext
|
||||
|
||||
EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
|
||||
|
||||
# Apt wants to know the glibc version by running a binary file, which will
|
||||
# fail, so we have to tell configure which version to use Since I don't know
|
||||
# the impliations of setting a wrong value I only provide one for angstrom,
|
||||
# which uses glibc 2.5 (which claims to be 2.4)
|
||||
# Koen - 20070327
|
||||
EXTRA_OECONF_append_angstrom = " ac_cv_glibc_ver=libc6.4"
|
||||
|
||||
# under Debian it is set to libc6.3 as they use glibc 2.3
|
||||
# They also provide glibc 2.5 in 'experimental' and it works with APT built
|
||||
# for 2.3 so we set it in same way
|
||||
EXTRA_OECONF_append = " ac_cv_glibc_ver=libc6.3"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
require apt.inc
|
||||
PR = "r2"
|
||||
|
||||
SRC_URI += "file://autofoo.patch;patch=1 \
|
||||
file://nodoc.patch;patch=1"
|
||||
SRC_URI += "file://nodoc.patch;patch=1"
|
||||
|
||||
require apt-package.inc
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,13 @@
|
|||
Index: apt-0.6.46.2/buildlib/environment.mak.in
|
||||
===================================================================
|
||||
--- apt-0.6.46.2.orig/buildlib/environment.mak.in 2007-03-29 11:38:58.000000000 +0100
|
||||
+++ apt-0.6.46.2/buildlib/environment.mak.in 2007-03-29 11:39:12.000000000 +0100
|
||||
@@ -62,7 +62,7 @@
|
||||
|
||||
# Shared library things
|
||||
HOST_OS = @host_os@
|
||||
-ifneq ($(words $(filter linux-gnu gnu% %gnu,$(HOST_OS))),0)
|
||||
+ifneq ($(words $(filter linux-gnu linux-gnueabi gnu% %gnu,$(HOST_OS))),0)
|
||||
SONAME_MAGIC=-Wl,-soname -Wl,
|
||||
LFLAGS_SO=
|
||||
else
|
||||
Loading…
Reference in New Issue