From ed41be330587cd0051cf59f1d7396e6744a933ec Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 1 Apr 2010 08:05:42 +0200 Subject: remove ustl, add some more bulkallmodconfig fixes --- package/udev/patches/patch-Makefile_in | 118 +++++++++++ package/ustl/Makefile | 33 --- package/ustl/files/Common.mk | 74 ------- package/ustl/files/config.h | 286 -------------------------- package/ustl/patches/01-install-DESTDIR.patch | 56 ----- package/ustl/patches/02-install_path.patch | 12 -- 6 files changed, 118 insertions(+), 461 deletions(-) create mode 100644 package/udev/patches/patch-Makefile_in delete mode 100644 package/ustl/Makefile delete mode 100644 package/ustl/files/Common.mk delete mode 100644 package/ustl/files/config.h delete mode 100644 package/ustl/patches/01-install-DESTDIR.patch delete mode 100644 package/ustl/patches/02-install_path.patch (limited to 'package') diff --git a/package/udev/patches/patch-Makefile_in b/package/udev/patches/patch-Makefile_in new file mode 100644 index 000000000..1f49ed49b --- /dev/null +++ b/package/udev/patches/patch-Makefile_in @@ -0,0 +1,118 @@ +--- udev-151.orig/Makefile.in 2010-01-27 09:34:59.000000000 +0100 ++++ udev-151/Makefile.in 2010-03-17 22:14:17.343159812 +0100 +@@ -48,7 +48,6 @@ sbin_PROGRAMS = udev/udevd$(EXEEXT) udev + check_PROGRAMS = libudev/test-libudev$(EXEEXT) udev/test-udev$(EXEEXT) + libexec_PROGRAMS = extras/firmware/firmware$(EXEEXT) \ + extras/ata_id/ata_id$(EXEEXT) \ +- extras/cdrom_id/cdrom_id$(EXEEXT) \ + extras/collect/collect$(EXEEXT) extras/edd_id/edd_id$(EXEEXT) \ + extras/floppy/create_floppy_devices$(EXEEXT) \ + extras/input_id/input_id$(EXEEXT) \ +@@ -221,11 +220,6 @@ PROGRAMS = $(libexec_PROGRAMS) $(sbin_PR + am_extras_ata_id_ata_id_OBJECTS = extras/ata_id/ata_id.$(OBJEXT) + extras_ata_id_ata_id_OBJECTS = $(am_extras_ata_id_ata_id_OBJECTS) + extras_ata_id_ata_id_DEPENDENCIES = libudev/libudev-private.la +-am_extras_cdrom_id_cdrom_id_OBJECTS = \ +- extras/cdrom_id/cdrom_id.$(OBJEXT) +-extras_cdrom_id_cdrom_id_OBJECTS = \ +- $(am_extras_cdrom_id_cdrom_id_OBJECTS) +-extras_cdrom_id_cdrom_id_DEPENDENCIES = libudev/libudev-private.la + am_extras_collect_collect_OBJECTS = extras/collect/collect.$(OBJEXT) + extras_collect_collect_OBJECTS = $(am_extras_collect_collect_OBJECTS) + extras_collect_collect_DEPENDENCIES = libudev/libudev-private.la +@@ -366,7 +360,6 @@ SOURCES = $(extras_gudev_libgudev_1_0_la + $(dist_extras_gudev_libgudev_1_0_la_SOURCES) \ + $(libudev_libudev_private_la_SOURCES) \ + $(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \ +- $(extras_cdrom_id_cdrom_id_SOURCES) \ + $(extras_collect_collect_SOURCES) \ + $(extras_edd_id_edd_id_SOURCES) \ + $(extras_firmware_firmware_SOURCES) \ +@@ -390,7 +383,6 @@ DIST_SOURCES = $(am__extras_gudev_libgud + $(am__dist_extras_gudev_libgudev_1_0_la_SOURCES_DIST) \ + $(am__libudev_libudev_private_la_SOURCES_DIST) \ + $(libudev_libudev_la_SOURCES) $(extras_ata_id_ata_id_SOURCES) \ +- $(extras_cdrom_id_cdrom_id_SOURCES) \ + $(extras_collect_collect_SOURCES) \ + $(extras_edd_id_edd_id_SOURCES) \ + $(extras_firmware_firmware_SOURCES) \ +@@ -477,7 +469,6 @@ am__dist_udevrules_DATA_DIST = rules/rul + extras/rule_generator/75-cd-aliases-generator.rules \ + extras/rule_generator/75-persistent-net-generator.rules \ + extras/firmware/50-firmware.rules \ +- extras/cdrom_id/60-cdrom_id.rules \ + extras/edd_id/61-persistent-storage-edd.rules \ + extras/floppy/60-floppy.rules \ + extras/fstab_import/79-fstab_import.rules \ +@@ -748,7 +739,6 @@ dist_udevrules_DATA = rules/rules.d/50-u + extras/rule_generator/75-cd-aliases-generator.rules \ + extras/rule_generator/75-persistent-net-generator.rules \ + extras/firmware/50-firmware.rules \ +- extras/cdrom_id/60-cdrom_id.rules \ + extras/edd_id/61-persistent-storage-edd.rules \ + extras/floppy/60-floppy.rules \ + extras/fstab_import/79-fstab_import.rules \ +@@ -820,12 +810,6 @@ extras_ata_id_ata_id_SOURCES = extras/at + extras_ata_id_ata_id_LDADD = libudev/libudev-private.la + + # ------------------------------------------------------------------------------ +-# cdrom_id - optical drive/media capability +-# ------------------------------------------------------------------------------ +-extras_cdrom_id_cdrom_id_SOURCES = extras/cdrom_id/cdrom_id.c +-extras_cdrom_id_cdrom_id_LDADD = libudev/libudev-private.la +- +-# ------------------------------------------------------------------------------ + # collect - trigger action when a collection of devices appeared + # ------------------------------------------------------------------------------ + extras_collect_collect_SOURCES = extras/collect/collect.c +@@ -1314,17 +1298,6 @@ extras/ata_id/ata_id.$(OBJEXT): extras/a + extras/ata_id/ata_id$(EXEEXT): $(extras_ata_id_ata_id_OBJECTS) $(extras_ata_id_ata_id_DEPENDENCIES) extras/ata_id/$(am__dirstamp) + @rm -f extras/ata_id/ata_id$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(extras_ata_id_ata_id_OBJECTS) $(extras_ata_id_ata_id_LDADD) $(LIBS) +-extras/cdrom_id/$(am__dirstamp): +- @$(MKDIR_P) extras/cdrom_id +- @: > extras/cdrom_id/$(am__dirstamp) +-extras/cdrom_id/$(DEPDIR)/$(am__dirstamp): +- @$(MKDIR_P) extras/cdrom_id/$(DEPDIR) +- @: > extras/cdrom_id/$(DEPDIR)/$(am__dirstamp) +-extras/cdrom_id/cdrom_id.$(OBJEXT): extras/cdrom_id/$(am__dirstamp) \ +- extras/cdrom_id/$(DEPDIR)/$(am__dirstamp) +-extras/cdrom_id/cdrom_id$(EXEEXT): $(extras_cdrom_id_cdrom_id_OBJECTS) $(extras_cdrom_id_cdrom_id_DEPENDENCIES) extras/cdrom_id/$(am__dirstamp) +- @rm -f extras/cdrom_id/cdrom_id$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(extras_cdrom_id_cdrom_id_OBJECTS) $(extras_cdrom_id_cdrom_id_LDADD) $(LIBS) + extras/collect/$(am__dirstamp): + @$(MKDIR_P) extras/collect + @: > extras/collect/$(am__dirstamp) +@@ -1598,7 +1571,6 @@ uninstall-dist_libexecSCRIPTS: + mostlyclean-compile: + -rm -f *.$(OBJEXT) + -rm -f extras/ata_id/ata_id.$(OBJEXT) +- -rm -f extras/cdrom_id/cdrom_id.$(OBJEXT) + -rm -f extras/collect/collect.$(OBJEXT) + -rm -f extras/edd_id/edd_id.$(OBJEXT) + -rm -f extras/firmware/firmware.$(OBJEXT) +@@ -1670,7 +1642,6 @@ distclean-compile: + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@extras/ata_id/$(DEPDIR)/ata_id.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@extras/cdrom_id/$(DEPDIR)/cdrom_id.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@extras/collect/$(DEPDIR)/collect.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@extras/edd_id/$(DEPDIR)/edd_id.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@extras/firmware/$(DEPDIR)/firmware.Po@am__quote@ +@@ -1931,7 +1902,6 @@ mostlyclean-libtool: + clean-libtool: + -rm -rf .libs _libs + -rm -rf extras/ata_id/.libs extras/ata_id/_libs +- -rm -rf extras/cdrom_id/.libs extras/cdrom_id/_libs + -rm -rf extras/collect/.libs extras/collect/_libs + -rm -rf extras/edd_id/.libs extras/edd_id/_libs + -rm -rf extras/firmware/.libs extras/firmware/_libs +@@ -2729,8 +2699,6 @@ distclean-generic: + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) + -rm -f extras/ata_id/$(DEPDIR)/$(am__dirstamp) + -rm -f extras/ata_id/$(am__dirstamp) +- -rm -f extras/cdrom_id/$(DEPDIR)/$(am__dirstamp) +- -rm -f extras/cdrom_id/$(am__dirstamp) + -rm -f extras/collect/$(DEPDIR)/$(am__dirstamp) + -rm -f extras/collect/$(am__dirstamp) + -rm -f extras/edd_id/$(DEPDIR)/$(am__dirstamp) diff --git a/package/ustl/Makefile b/package/ustl/Makefile deleted file mode 100644 index c1d8943b4..000000000 --- a/package/ustl/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${TOPDIR}/rules.mk - -PKG_NAME:= ustl -PKG_VERSION:= 0.8 -PKG_RELEASE:= 1 -PKG_MD5SUM:= dd59483c327f1bd1356273bc5ae4dde0 -PKG_DESCR:= An STL (Standard Template Library) for embedded systems -PKG_SECTION:= libs -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=ustl/} - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}-0.tar.bz2 - -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,USTL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) - -CONFIG_STYLE:= manual - -XAKE_FLAGS+= CROSS="${TARGET_CROSS}" \ - OPTFLAGS="${TARGET_CFLAGS}" - -do-configure: - ${CP} ./files/config.h ${WRKBUILD}/ - ${CP} ./files/Common.mk ${WRKBUILD}/ - -post-install: - ${INSTALL_DIR} ${IDIR_USTL}/usr/lib - ${CP} ${WRKINST}/usr/lib/libustl.so* ${IDIR_USTL}/usr/lib/ - -include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/ustl/files/Common.mk b/package/ustl/files/Common.mk deleted file mode 100644 index 88e62329d..000000000 --- a/package/ustl/files/Common.mk +++ /dev/null @@ -1,74 +0,0 @@ -LIBNAME = ustl -MAJOR = 0 -MINOR = 8 -BUILD = 0 - -CC = $(CROSS)gcc -CXX = $(CROSS)g++ -LD = $(CROSS)gcc -AR = $(CROSS)ar -RANLIB = $(CROSS)ranlib -DOXYGEN = echo -INSTALL = install -RM = rm -f -LN = ln -sf - -prefix = /usr -exec_prefix = /usr -BINDIR = /usr/bin -INCDIR = /usr/include -LIBDIR = /usr/lib - -DESTDIR = - -INSTALLDIR = ${INSTALL} -d -INSTALLLIB = ${INSTALL} -p -m 644 -INSTALLEXE = ${INSTALL} -p -m 755 -INSTALLDATA = ${INSTALL} -p -m 644 - -CWARNOPTS = -Wall -W -Wpointer-arith -Wno-cast-align \ - -Wcast-qual -Wwrite-strings -Wredundant-decls -CXXWARNOPTS = ${CWARNOPTS} -Wconversion -Wsign-promo -Wsynth -Woverloaded-virtual -PROCESSOR_OPTS = -INLINE_OPTS = -finline-limit=65535 -CUSTOMINCDIR = -CUSTOMLIBDIR = - -BUILD_SHARED = 1 -BUILD_STATIC = 1 -#DEBUG = 1 -#PROFILE = 1 -STANDALONE = -nodefaultlibs - -CFLAGS = \ - ${CUSTOMINCDIR} ${OPTFLAGS} ${CWARNOPTS} ${STANDALONE} -CXXFLAGS = \ - ${CUSTOMINCDIR} ${OPTFLAGS} ${INLINE_OPTS} \ - ${CXXWARNOPTS} ${STANDALONE} -fno-builtin -LDFLAGS = ${CUSTOMLIBDIR} ${STANDALONE} -OPTFLAGS = ${PROCESSOR_OPTS} -ifdef DEBUG - OPTFLAGS += -O0 -g -else - OPTFLAGS += -O3 -DNDEBUG=1 -endif -ifdef PROFILE - OPTFLAGS += -pg -endif -ifdef STANDALONE - LIBS += -lsupc++ -lgcc_eh -lgcc -lc -endif -ifdef BUILD_SHARED - CFLAGS += -fPIC - CXXFLAGS += -fPIC -endif -SHBLDFL = -shared - -LIBA = lib${LIBNAME}.a -LIBSO = lib${LIBNAME}.so -ifdef MAJOR -LIBSOLNK = ${LIBSO}.${MAJOR}.${MINOR} -LIBSOBLD = ${LIBSO}.${MAJOR}.${MINOR}.${BUILD} -endif -TOCLEAN += ${LIBSO} ${LIBA} ${LIBSOBLD} - diff --git a/package/ustl/files/config.h b/package/ustl/files/config.h deleted file mode 100644 index 348649678..000000000 --- a/package/ustl/files/config.h +++ /dev/null @@ -1,286 +0,0 @@ -// config.h -// -// Autogenerated from config.h.in by bsconf. -// - -#ifndef CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F -#define CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F - -// Define to the one symbol short name of this package. -#define USTL_NAME "ustl" -// Define to the full name and version of this package. -#define USTL_STRING "ustl 0.8" -// Define to the version of this package. -#define USTL_VERSION 0x080 -// Define to the address where bug reports for this package should be sent. -#define USTL_BUGREPORT "Mike Sharov " - -/// Define to 1 if you want stream operations to throw exceptions on -/// insufficient data or insufficient space. All these errors should -/// be preventable in output code; the input code should verify the -/// data in a separate step. It slows down stream operations a lot, -/// but it's your call. By default only debug builds throw. -/// -#undef WANT_STREAM_BOUNDS_CHECKING - -#if !defined(WANT_STREAM_BOUNDS_CHECKING) && !defined(NDEBUG) - #define WANT_STREAM_BOUNDS_CHECKING 1 -#endif - -/// Define to 1 if you want to build without libstdc++ -#define WITHOUT_LIBSTDCPP 1 - -/// Define to 1 if you don't want the standard streams. -/// You will not be able to run bvt tests if you do this. -/// -#undef WITHOUT_CIN_COUT_CERR - -/// Define GNU extensions if unavailable. -#ifndef __GNUC__ - /// GCC (and some other compilers) define '__attribute__'; ustl is using this - /// macro to alert the compiler to flag inconsistencies in printf/scanf-like - /// function calls. Just in case '__attribute__' isn't defined, make a dummy. - /// - #ifndef __attribute__ - #define __attribute__(p) - #endif -#endif -#if defined(__GNUC__) && (__GNUC__ >= 4) - #define DLL_EXPORT __attribute__((visibility("default"))) - #define DLL_LOCAL __attribute__((visibility("hidden"))) -#else - #define DLL_EXPORT - #define DLL_LOCAL -#endif -#if defined(__GNUC__) && (__GNUC__ >= 3) && defined(__i386__) - /// GCC 3+ supports the prefetch directive, which some CPUs use to improve caching - #define prefetch(p,rw,loc) __builtin_prefetch(p,rw,loc) -#else - #define prefetch(p,rw,loc) -#endif -#if !defined(__GNUC__) || (__GNUC__ < 3) - /// __alignof__ returns the recommended alignment for the type - #define __alignof__(v) min(sizeof(v), sizeof(void*)) -#endif - -/// Define to 1 if you have the `atexit' function. -#define HAVE_ATEXIT 1 - -/// Define to 1 if you have the header file. -#define HAVE_ASSERT_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_CTYPE_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_ERRNO_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_FCNTL_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_FLOAT_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_INTTYPES_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_LIMITS_H 1 - -/// Define to 1 if you have the header file. -#define HAVE_LOCALE_H 1 - -/// Define to 1 if your system has a working `malloc' function. -#define HAVE_MALLOC 1 - -// Define to 1 if you have the header file. -#define HAVE_MALLOC_H 1 - -// Define to 1 if you have the header file. -#define HAVE_ALLOCA_H 1 - -// Define to 1 if you have the `memchr' function. -#define HAVE_MEMCHR 1 - -// Define to 1 if you have the `memmove' function. -#define HAVE_MEMMOVE 1 - -// Define to 1 if you have the header file. -#define HAVE_MEMORY_H 1 - -// Define to 1 if you have the `memset' function. -#define HAVE_MEMSET 1 - -// Define to 1 if the system has the type `ptrdiff_t'. -#define HAVE_PTRDIFF_T 1 - -// Define to 1 if you have the header file. -#define HAVE_SIGNAL_H 1 - -// Define to 1 if you have the __va_copy function -#define HAVE_VA_COPY 1 - -// Define to 1 if `stat' has the bug that it succeeds when given the -// zero-length file name argument. -/* #undef HAVE_STAT_EMPTY_STRING_BUG */ - -// Define to 1 if you have the header file. -#define HAVE_STDARG_H 1 - -// Define to 1 if you have the header file. -#define HAVE_STDDEF_H 1 - -// Define to 1 if you have the header file. -#define HAVE_STDINT_H 1 - -// Define to 1 if you have the header file. -#define HAVE_STDIO_H 1 - -// Define to 1 if you have the header file. -#define HAVE_STDLIB_H 1 - -// Define to 1 if you have the `strerror' function. -#define HAVE_STRERROR 1 - -// Define to 1 if you have the header file. -#define HAVE_STRINGS_H 1 - -// Define to 1 if you have the header file. -#define HAVE_STRING_H 1 - -// Define to 1 if you have the `strrchr' function. -#define HAVE_STRRCHR 1 - -// Define to 1 if you have the `strsignal' function. -#define HAVE_STRSIGNAL 1 - -// Define to 1 if you have the `strtol' function. -#define HAVE_STRTOL 1 - -// Define to 1 if you have the header file. -#define HAVE_SYS_STAT_H 1 - -// Define to 1 if you have the header file. -#define HAVE_SYS_TYPES_H 1 - -// Define to 1 if you have that is POSIX.1 compatible. -#define HAVE_SYS_WAIT_H 1 - -// Define to 1 if you have the header file. -#define HAVE_TIME_H 1 - -// Define to 1 if you have the header file. -#define HAVE_UNISTD_H 1 - -// Define to 1 if you have the header file. -#define HAVE_MATH_H 1 - -// Define to 1 if you have the rintf function. Will use rint otherwise. -#undef HAVE_RINTF - -// STDC_HEADERS is defined to 1 on sane systems. -#if defined(HAVE_ASSERT_H) && defined(HAVE_CTYPE_H) &&\ - defined(HAVE_ERRNO_H) && defined(HAVE_FLOAT_H) &&\ - defined(HAVE_LIMITS_H) && defined(HAVE_LOCALE_H) &&\ - defined(HAVE_MATH_H) && defined(HAVE_SIGNAL_H) &&\ - defined(HAVE_STDARG_H) && defined(HAVE_STDDEF_H) &&\ - defined(HAVE_STDIO_H) && defined(HAVE_STDLIB_H) &&\ - defined(HAVE_STRING_H) && defined(HAVE_TIME_H) -#define STDC_HEADERS 1 -#endif - -// STDC_HEADERS is defined to 1 on unix systems. -#if defined(HAVE_FCNTL_H) && defined(HAVE_SYS_STAT_H) && defined(HAVE_UNISTD_H) -#define STDUNIX_HEADERS 1 -#endif - -// Define to 1 if you have the header file. -#if (__GNUC__ >= 3) // gcc 2.95 somehow doesn't recognize 'asm volatile' in libc byteswap.h -#define HAVE_BYTESWAP_H 1 -#endif - -// Define to 1 if `lstat' dereferences a symlink specified with a trailing slash. -#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 - -// Define to 1 if your compiler treats char as a separate type along with -// signed char and unsigned char. This will create overloads for char. -#define HAVE_THREE_CHAR_TYPES 1 - -// Define as the return type of signal handlers (`int' or `void'). -#define RETSIGTYPE void - -// Define to 1 if you have 64 bit types available -#define HAVE_INT64_T 1 - -// Define to 1 if you have the long long type -#define HAVE_LONG_LONG 1 - -// Define to 1 if you want unrolled specializations for fill and copy -#undef WANT_UNROLLED_COPY - -// Define to 1 if you want to use MMX/SSE/3dNow! processor instructions -#undef WANT_MMX - -// Define to byte sizes of types -#define SIZE_OF_CHAR 1 -#define SIZE_OF_SHORT 2 -#define SIZE_OF_INT 4 -#define SIZE_OF_LONG 4 -#define SIZE_OF_LONG_LONG 8 -#define SIZE_OF_POINTER 4 -#define SIZE_OF_SIZE_T 4 -#define SIZE_OF_BOOL SIZE_OF_CHAR -#undef SIZE_T_IS_LONG - -// Byte order macros, converted in utypes.h -#define USTL_LITTLE_ENDIAN 4321 -#define USTL_BIG_ENDIAN 1234 -#define USTL_BYTE_ORDER USTL_LITTLE_ENDIAN - -// Extended CPU capabilities -#define CPU_HAS_FPU 1 -#define CPU_HAS_EXT_DEBUG 1 -#define CPU_HAS_TIMESTAMPC 1 -#define CPU_HAS_MSR 1 -#define CPU_HAS_CMPXCHG8 1 -#define CPU_HAS_APIC 1 -#define CPU_HAS_SYSCALL 1 -#define CPU_HAS_MTRR 1 -#define CPU_HAS_CMOV 1 -#define CPU_HAS_FCMOV 1 -#if WANT_MMX -#undef CPU_HAS_MMX 1 -#undef CPU_HAS_FXSAVE -#undef CPU_HAS_SSE 1 -#undef CPU_HAS_SSE2 1 -#undef CPU_HAS_SSE3 -#undef CPU_HAS_EXT_3DNOW -#undef CPU_HAS_3DNOW -#endif - -// GCC vector extensions -#if defined(CPU_HAS_MMX) || defined(CPU_HAS_SSE) - #undef HAVE_VECTOR_EXTENSIONS -#endif - -#if CPU_HAS_SSE && defined(__GNUC__) - #define __sse_align __attribute__((aligned(16))) -#else - #define __sse_align -#endif - -// Define to empty if `const' does not conform to ANSI C. -/* #define const */ - -// Define as `__inline' if that's what the C compiler calls it, or to nothing -// if it is not supported. -/* #define inline __inline */ - -// Define to `long' if does not define. -/* typedef long off_t; */ - -// Define to `unsigned' if does not define. -/* typedef long size_t; */ - -#endif // CONFIG_H_01E33670634DAAC779EE5FF41CCBB36F - diff --git a/package/ustl/patches/01-install-DESTDIR.patch b/package/ustl/patches/01-install-DESTDIR.patch deleted file mode 100644 index ec3a959d3..000000000 --- a/package/ustl/patches/01-install-DESTDIR.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -ruN ustl-0.8-old/Makefile ustl-0.8-new/Makefile ---- ustl-0.8-old/Makefile 2005-11-10 21:06:53.000000000 +0100 -+++ ustl-0.8-new/Makefile 2005-12-08 13:57:07.000000000 +0100 -@@ -39,35 +39,35 @@ - .PHONY: install-static install-shared uninstall-static uninstall-shared - - install-shared: ${LIBSOBLD} install-incs -- @echo "Installing ${LIBSOBLD} to ${LIBDIR} ..." -- @${INSTALLDIR} ${LIBDIR} -- @${INSTALLLIB} ${LIBSOBLD} ${LIBDIR} -- @(cd ${LIBDIR}; ${RM} ${LIBSO} ${LIBSOLNK}; ${LN} -sf ${LIBSOBLD} ${LIBSO}; ${LN} -sf ${LIBSOBLD} ${LIBSOLNK}) -+ @echo "Installing ${LIBSOBLD} to ${DESTDIR}${LIBDIR} ..." -+ @${INSTALLDIR} ${DESTDIR}${LIBDIR} -+ @${INSTALLLIB} ${LIBSOBLD} ${DESTDIR}${LIBDIR} -+ @(cd ${DESTDIR}${LIBDIR}; ${RM} ${LIBSO} ${LIBSOLNK}; ${LN} -sf ${LIBSOBLD} ${LIBSO}; ${LN} -sf ${LIBSOBLD} ${LIBSOLNK}) - - uninstall-shared: uninstall-incs -- @echo "Removing ${LIBSOBLD} from ${LIBDIR} ..." -- @${RM} -f ${LIBDIR}/${LIBSO} ${LIBDIR}/${LIBSOLNK} ${LIBDIR}/${LIBSOBLD} -+ @echo "Removing ${LIBSOBLD} from ${DESTDIR}${LIBDIR} ..." -+ @${RM} -f ${DESTDIR}${LIBDIR}/${LIBSO} ${DESTDIR}${LIBDIR}/${LIBSOLNK} ${DESTDIR}${LIBDIR}/${LIBSOBLD} - - install-static: ${LIBA} install-incs -- @echo "Installing ${LIBA} to ${LIBDIR} ..." -- @${INSTALLDIR} ${LIBDIR} -- @${INSTALLLIB} ${LIBA} ${LIBDIR} -+ @echo "Installing ${LIBA} to ${DESTDIR}${LIBDIR} ..." -+ @${INSTALLDIR} ${DESTDIR}${LIBDIR} -+ @${INSTALLLIB} ${LIBA} ${DESTDIR}${LIBDIR} - - uninstall-static: uninstall-incs -- @echo "Removing ${LIBA} from ${LIBDIR} ..." -- @${RM} -f ${LIBDIR}/${LIBA} -+ @echo "Removing ${LIBA} from ${DESTDIR}${LIBDIR} ..." -+ @${RM} -f ${DESTDIR}${LIBDIR}/${LIBA} - - install-incs: ${INCS} -- @echo "Installing headers to ${INCDIR} ..." -- @${INSTALLDIR} ${INCDIR}/${LIBNAME} -+ @echo "Installing headers to ${DESTDIR}${INCDIR} ..." -+ @${INSTALLDIR} ${DESTDIR}${INCDIR}/${LIBNAME} - @for i in $(filter-out ${LIBNAME}.h,${INCS}); do \ -- ${INSTALLDATA} $$i ${INCDIR}/${LIBNAME}/$$i; \ -+ ${INSTALLDATA} $$i ${DESTDIR}${INCDIR}/${LIBNAME}/$$i; \ - done; -- @${INSTALLDATA} ${LIBNAME}.h ${INCDIR} -+ @${INSTALLDATA} ${LIBNAME}.h ${DESTDIR}${INCDIR} - - uninstall-incs: -- @echo "Removing headers from ${INCDIR} ..." -- @${RM} -rf ${INCDIR}/${LIBNAME} ${INCDIR}/${LIBNAME}.h -+ @echo "Removing headers from ${DESTDIR}${INCDIR} ..." -+ @${RM} -rf ${DESTDIR}${INCDIR}/${LIBNAME} ${DESTDIR}${INCDIR}/${LIBNAME}.h - - - %.o: %.cc diff --git a/package/ustl/patches/02-install_path.patch b/package/ustl/patches/02-install_path.patch deleted file mode 100644 index 3a7cf8a05..000000000 --- a/package/ustl/patches/02-install_path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN ustl.old/Common.mk.in ustl.dev/Common.mk.in ---- ustl.old/Common.mk.in 2005-11-10 21:06:53.000000000 +0100 -+++ ustl.dev/Common.mk.in 2006-03-23 16:12:05.000000000 +0100 -@@ -9,7 +9,7 @@ - AR = @AR@ - RANLIB = @RANLIB@ - DOXYGEN = @DOXYGEN@ --INSTALL = @INSTALL@ -+INSTALL = install - RM = @RM@ - LN = @LN@ - -- cgit v1.2.3