emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the config.h kludge and override vasprintf detection via HAVE_VASPRINTF.

Browse Source
This commit is contained in:
Juan RP 2014-01-20 18:50:33 +01:00
parent 16fc064aef
commit 5eea259c13
18 changed files with 36 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -12,7 +12,7 @@ endif
.PHONY: all .PHONY: all
all: all:
@if test ! -e config.h; then \ @if test ! -e config.mk; then \
echo "You didn't run ./configure ... exiting."; \ echo "You didn't run ./configure ... exiting."; \
exit 1; \ exit 1; \
fi fi
@ -45,4 +45,4 @@ clean:
@for dir in $(SUBDIRS); do \ @for dir in $(SUBDIRS); do \
$(MAKE) -C $$dir clean || exit 1; \ $(MAKE) -C $$dir clean || exit 1; \
done done
-rm -f config.h config.mk _ccflag.{,c,err} -rm -f config.mk _ccflag.{,c,err}

1
bin/xbps-install/fetch_cb.c
View File

@ -42,7 +42,6 @@
#include <xbps.h> #include <xbps.h>
#include "defs.h" #include "defs.h"
#include "config.h"
static void static void
get_time(struct timeval *tvp) get_time(struct timeval *tvp)

4
bin/xbps-query/search.c
View File

@ -27,9 +27,7 @@
# define _GNU_SOURCE /* for strcasestr(3) */ # define _GNU_SOURCE /* for strcasestr(3) */
#endif #endif
#ifdef HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>

32
configure vendored
View File

@ -111,7 +111,6 @@ _which()
return 1 return 1
} }
CONFIG_H=config.h
CONFIG_MK=config.mk CONFIG_MK=config.mk
if [ -z "$BUILD" ]; then if [ -z "$BUILD" ]; then
@ -138,9 +137,8 @@ if [ -z "$OS" ]; then
fi fi
echo "Configuring xbps for ... $OS" echo "Configuring xbps for ... $OS"
rm -f $CONFIG_H $CONFIG_MK rm -f $CONFIG_MK
echo "# Common vars used by XBPS on $OS." >$CONFIG_MK echo "# Common vars used by XBPS on $OS." >$CONFIG_MK
echo "/* $OS */" >$CONFIG_H
echo "VERSION = $VERSION" >>$CONFIG_MK echo "VERSION = $VERSION" >>$CONFIG_MK
echo "TOPDIR ?= $TOPDIR" >>$CONFIG_MK echo "TOPDIR ?= $TOPDIR" >>$CONFIG_MK
@ -186,7 +184,6 @@ echo "CFLAGS = -O2 -pthread" >>$CONFIG_MK
echo "LDFLAGS = -L\$(TOPDIR)/lib" >>$CONFIG_MK echo "LDFLAGS = -L\$(TOPDIR)/lib" >>$CONFIG_MK
echo "CPPFLAGS = -I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK echo "CPPFLAGS = -I. -I\$(TOPDIR) -I\$(TOPDIR)/include" >>$CONFIG_MK
echo "CPPFLAGS += -DHAVE_CONFIG_H" >>$CONFIG_MK
echo "CPPFLAGS += -DXBPS_SYSCONF_PATH=\\\"${ETCDIR}\\\"" >>$CONFIG_MK echo "CPPFLAGS += -DXBPS_SYSCONF_PATH=\\\"${ETCDIR}\\\"" >>$CONFIG_MK
echo "CPPFLAGS += -DXBPS_VERSION=\\\"${VERSION}\\\"" >>$CONFIG_MK echo "CPPFLAGS += -DXBPS_VERSION=\\\"${VERSION}\\\"" >>$CONFIG_MK
echo "CPPFLAGS += -D_unused=\"__attribute__((__unused__))\"" >>$CONFIG_MK echo "CPPFLAGS += -D_unused=\"__attribute__((__unused__))\"" >>$CONFIG_MK
@ -206,7 +203,7 @@ fi
case "$OS" in case "$OS" in
linux) linux)
echo "CPPFLAGS += -D_XOPEN_SOURCE=700" >>$CONFIG_MK echo "CPPFLAGS += -D_XOPEN_SOURCE=700" >>$CONFIG_MK
echo "CPPFLAGS += -D_FILE_OFFSET_BITS=64" >> $CONFIG_MK echo "CPPFLAGS += -D_FILE_OFFSET_BITS=64" >> $CONFIG_MK
;; ;;
*) *)
@ -346,22 +343,31 @@ echo "STATIC_LIBS += -lpthread" >>$CONFIG_MK
# #
func=vasprintf func=vasprintf
printf "Checking for $func() ... " printf "Checking for $func() ... "
cat <<EOF >_$func.c if test -n "$HAVE_VASPRINTF"; then
echo "yes (cached)."
else
cat <<EOF >_$func.c
#define _GNU_SOURCE
#include <stdio.h> #include <stdio.h>
int main(void) { int main(void) {
vasprintf(NULL, NULL, NULL); vasprintf(NULL, NULL, NULL);
return 0; return 0;
} }
EOF EOF
if $XCC -D_GNU_SOURCE _$func.c -o _$func 2>/dev/null; then
echo yes. if $XCC _$func.c -o _$func 2>/dev/null; then
echo yes.
HAVE_VASPRINTF=1
else
echo no.
fi
rm -f _$func.c _$func
fi
if test -n "$HAVE_VASPRINTF"; then
echo "CPPFLAGS += -DHAVE_VASPRINTF" >> $CONFIG_MK echo "CPPFLAGS += -DHAVE_VASPRINTF" >> $CONFIG_MK
else else
echo no.
echo "COMPAT_SRCS+= compat/vasprintf.o" >>$CONFIG_MK echo "COMPAT_SRCS+= compat/vasprintf.o" >>$CONFIG_MK
echo "#include \"compat.h\"" >>$CONFIG_H
fi fi
rm -f _$func.c _$func
# #
# Check for strcasestr(). # Check for strcasestr().
@ -384,7 +390,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
else else
echo no. echo no.
echo "COMPAT_SRCS += compat/strcasestr.o" >>$CONFIG_MK echo "COMPAT_SRCS += compat/strcasestr.o" >>$CONFIG_MK
echo "#include \"compat.h\"" >>$CONFIG_H
fi fi
rm -f _$func _$func.c rm -f _$func _$func.c
@ -408,7 +413,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
else else
echo no. echo no.
echo "COMPAT_SRCS += compat/strlcpy.o" >>$CONFIG_MK echo "COMPAT_SRCS += compat/strlcpy.o" >>$CONFIG_MK
echo "#include \"compat.h\"" >>$CONFIG_H
fi fi
rm -f _$func.c _$func rm -f _$func.c _$func
@ -431,7 +435,6 @@ if $XCC _$func.c -o _$func 2>/dev/null; then
else else
echo no. echo no.
echo "COMPAT_SRCS += compat/strlcat.o" >>$CONFIG_MK echo "COMPAT_SRCS += compat/strlcat.o" >>$CONFIG_MK
echo "#include \"compat.h\"" >>$CONFIG_H
fi fi
rm -f _$func.c _$func rm -f _$func.c _$func
@ -454,7 +457,6 @@ if $XCC -lutil _$func.c -o _$func 2>/dev/null; then
else else
echo no. echo no.
echo "COMPAT_SRCS+= compat/humanize_number.o" >>$CONFIG_MK echo "COMPAT_SRCS+= compat/humanize_number.o" >>$CONFIG_MK
echo "#include \"compat.h\"" >>$CONFIG_H
fi fi
rm -f _$func.c _$func rm -f _$func.c _$func

2
include/compat.h
View File

@ -22,7 +22,7 @@ size_t HIDDEN strlcpy(char *, const char *, size_t);
char HIDDEN *strcasestr(const char *, const char *); char HIDDEN *strcasestr(const char *, const char *);
#endif #endif
#if !defined(HAVE_VASPRINTF) && !defined(_GNU_SOURCE) #ifndef HAVE_VASPRINTF
int HIDDEN vasprintf(char **, const char *, va_list); int HIDDEN vasprintf(char **, const char *, va_list);
#endif #endif

2
include/xbps_api_impl.h
View File

@ -30,7 +30,7 @@
#include <assert.h> #include <assert.h>
#include <confuse.h> #include <confuse.h>
#define LIBXBPS_PRIVATE #define LIBXBPS_PRIVATE
#include <xbps.h> #include "xbps.h"
/* /*
* By default all public functions have default visibility, unless * By default all public functions have default visibility, unless

4
lib/cb_util.c
View File

@ -34,10 +34,6 @@
#include <stdarg.h> #include <stdarg.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
#ifdef __clang__ #ifdef __clang__

3
lib/external/dewey.c vendored
View File

@ -37,9 +37,6 @@
#include <ctype.h> #include <ctype.h>
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#define PKG_PATTERN_MAX 1024 #define PKG_PATTERN_MAX 1024

4
lib/external/fexec.c vendored
View File

@ -29,13 +29,15 @@
#define _BSD_SOURCE /* for vfork and chroot */ #define _BSD_SOURCE /* for vfork and chroot */
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#undef _BSD_SOURCE
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
static int static int

5
lib/fetch/common.c
View File

@ -30,9 +30,8 @@
* $FreeBSD: common.c,v 1.53 2007/12/19 00:26:36 des Exp $ * $FreeBSD: common.c,v 1.53 2007/12/19 00:26:36 des Exp $
*/ */
#if HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#ifndef NETBSD #ifndef NETBSD
#include <nbcompat.h> #include <nbcompat.h>
#endif #endif

5
lib/fetch/fetch.c
View File

@ -30,9 +30,8 @@
* $FreeBSD: fetch.c,v 1.41 2007/12/19 00:26:36 des Exp $ * $FreeBSD: fetch.c,v 1.41 2007/12/19 00:26:36 des Exp $
*/ */
#if HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#ifndef NETBSD #ifndef NETBSD
#include <nbcompat.h> #include <nbcompat.h>
#endif #endif

5
lib/fetch/file.c
View File

@ -30,9 +30,8 @@
* $FreeBSD: file.c,v 1.18 2007/12/14 10:26:58 des Exp $ * $FreeBSD: file.c,v 1.18 2007/12/14 10:26:58 des Exp $
*/ */
#if HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#ifndef NETBSD #ifndef NETBSD
#include <nbcompat.h> #include <nbcompat.h>
#endif #endif

5
lib/fetch/ftp.c
View File

@ -57,9 +57,8 @@
* *
*/ */
#if HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#ifndef NETBSD #ifndef NETBSD
#include <nbcompat.h> #include <nbcompat.h>
#endif #endif

5
lib/fetch/http.c
View File

@ -63,9 +63,8 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#if HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#ifndef NETBSD #ifndef NETBSD
#include <nbcompat.h> #include <nbcompat.h>
#endif #endif

1
lib/package_configure.c
View File

@ -29,7 +29,6 @@
#include <errno.h> #include <errno.h>
#include "xbps_api_impl.h" #include "xbps_api_impl.h"
/** /**
* @file lib/package_configure.c * @file lib/package_configure.c
* @brief Package configuration routines * @brief Package configuration routines

4
lib/package_unpack.c
View File

@ -23,10 +23,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <sys/stat.h> #include <sys/stat.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>

4
lib/portableproplib/prop_object.c
View File

@ -29,9 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#ifdef HAVE_CONFIG_H #include "compat.h"
#include "config.h"
#endif
#include <prop/prop_object.h> #include <prop/prop_object.h>
#include "prop_object_impl.h" #include "prop_object_impl.h"

4
lib/util.c
View File

@ -27,10 +27,6 @@
# define _GNU_SOURCE /* for vasprintf(3) */ # define _GNU_SOURCE /* for vasprintf(3) */
#endif #endif
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>