diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-08 11:24:12 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-08 11:24:12 +0000 |
commit | 228d1c4df21088ffb0f2e087eae8c4323ad05760 (patch) | |
tree | 5155ea7bc428f0af268c4c63435d0696d18b124d /package/uclibc++ | |
parent | e260ab73e0a396b3ba39824beb1fb71716828a7f (diff) |
move library packages to package/libs/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33657 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/uclibc++')
-rw-r--r-- | package/uclibc++/Makefile | 91 | ||||
-rw-r--r-- | package/uclibc++/files/config.default | 58 | ||||
-rw-r--r-- | package/uclibc++/patches/002-path_to_bash.patch | 11 | ||||
-rw-r--r-- | package/uclibc++/patches/006-eabi_fix.patch | 38 |
4 files changed, 0 insertions, 198 deletions
diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile deleted file mode 100644 index 15c2bce54..000000000 --- a/package/uclibc++/Makefile +++ /dev/null @@ -1,91 +0,0 @@ -# -# Copyright (C) 2006-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=uclibc++ -PKG_VERSION:=0.2.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=uClibc++-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://cxx.uclibc.org/src/ -PKG_MD5SUM:=394c119363dd8b469fb898442a6764b8 - -PKG_BUILD_DIR:=$(BUILD_DIR)/uClibc++-$(PKG_VERSION) -PKG_BUILD_PARALLEL:=1 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/uclibcxx - NAME:=uclibc++ - SECTION:=libs - CATEGORY:=Libraries - TITLE:=C++ library for embedded systems - URL:=http://cxx.uclibc.org/src/ -endef - -UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ - -e 's/i.86/i386/' \ - -e 's/sparc.*/sparc/' \ - -e 's/m68k.*/m68k/' \ - -e 's/ppc/powerpc/g' \ - -e 's/v850.*/v850/g' \ - -e 's/sh64/sh/' \ - -e 's/sh[234].*/sh/' \ - -e 's/mips.*/mips/' \ - -e 's/mipsel.*/mips/' \ - -e 's/cris.*/cris/' \ -) - -TARGET_CFLAGS += $(FPIC) - -ifneq ($(CONFIG_CCACHE),) -TARGET_CXX=$(TARGET_CXX_NOCACHE) -endif - -MAKE_FLAGS:= \ - TOPDIR="$(PKG_BUILD_DIR)/" \ - $(TARGET_CONFIGURE_OPTS) \ - CPU_CFLAGS="$(TARGET_CFLAGS)" \ - CROSS="$(TARGET_CROSS)" \ - CP="$(CP)" \ - GEN_LIBS="-lc $(LIBGCC_S)" \ - check_as_needed= - -# check_as_needed overrides dependency on libgcc_s - -define Build/Configure - if [ -f ./files/config.$(UCLIBC_TARGET_ARCH) ]; then \ - cp ./files/config.$(UCLIBC_TARGET_ARCH) $(PKG_BUILD_DIR)/.config; \ - else \ - cp ./files/config.default $(PKG_BUILD_DIR)/.config; \ - fi -endef - -define Build/InstallDev - $(INSTALL_DIR) $(2)/bin $(1)/usr/include/uClibc++ $(1)/usr/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/ - $(CP) $(PKG_INSTALL_DIR)/include/* $(1)/usr/include/uClibc++/ - $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++*.{a,so}* $(1)/usr/lib/ - $(SED) 's|-I/include/|-I$(STAGING_DIR)/usr/include/uClibc++/|g' $(TOOLCHAIN_DIR)/bin/g++-uc - $(SED) 's|-L/lib/|-L$(STAGING_DIR)/usr/lib/|g' $(TOOLCHAIN_DIR)/bin/g++-uc -# add another wrapper which links against both uClibc++ and libstdc++ - $(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin/g++-uc $(TOOLCHAIN_DIR)/bin/g++-uc+std - $(SED) 's|^WRAPPER_INCLUDEDIR=.*||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std - $(SED) 's|-luClibc++|-Wl,-Bdynamic,-luClibc++,-Bstatic,-lstdc++,-Bdynamic|g' $(TOOLCHAIN_DIR)/bin/g++-uc+std - $(SED) 's|-nostdinc++||g' $(TOOLCHAIN_DIR)/bin/g++-uc+std -endef - -define Package/uclibcxx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++.so.* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/lib/libuClibc++-*.so $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,uclibcxx)) diff --git a/package/uclibc++/files/config.default b/package/uclibc++/files/config.default deleted file mode 100644 index 944e1a6cf..000000000 --- a/package/uclibc++/files/config.default +++ /dev/null @@ -1,58 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Features and Options -# -UCLIBCXX_HAS_FLOATS=y -# UCLIBCXX_HAS_LONG_DOUBLE is not set -# UCLIBCXX_HAS_TLS is not set -WARNINGS="-Wall" -BUILD_EXTRA_LIBRARIES="" -HAVE_DOT_CONFIG=y - -# -# String and I/O Stream Support -# -UCLIBCXX_HAS_WCHAR=y -UCLIBCXX_IOSTREAM_BUFSIZE=32 -UCLIBCXX_HAS_LFS=y -UCLIBCXX_SUPPORT_CDIR=y -UCLIBCXX_SUPPORT_CIN=y -UCLIBCXX_SUPPORT_COUT=y -UCLIBCXX_SUPPORT_CERR=y -UCLIBCXX_SUPPORT_CLOG=y -UCLIBCXX_SUPPORT_WCIN=y -UCLIBCXX_SUPPORT_WCOUT=y -UCLIBCXX_SUPPORT_WCERR=y -UCLIBCXX_SUPPORT_WCLOG=y - -# -# STL and Code Expansion -# -UCLIBCXX_STL_BUFFER_SIZE=32 -UCLIBCXX_CODE_EXPANSION=y -UCLIBCXX_EXPAND_CONSTRUCTORS_DESTRUCTORS=y -UCLIBCXX_EXPAND_STRING_CHAR=y -UCLIBCXX_EXPAND_VECTOR_BASIC=y -UCLIBCXX_EXPAND_IOS_CHAR=y -UCLIBCXX_EXPAND_STREAMBUF_CHAR=y -UCLIBCXX_EXPAND_ISTREAM_CHAR=y -UCLIBCXX_EXPAND_OSTREAM_CHAR=y -UCLIBCXX_EXPAND_FSTREAM_CHAR=y -UCLIBCXX_EXPAND_SSTREAM_CHAR=y - -# -# Library Installation Options -# -UCLIBCXX_RUNTIME_PREFIX="" -UCLIBCXX_RUNTIME_INCLUDE_SUBDIR="/include" -UCLIBCXX_RUNTIME_LIB_SUBDIR="/lib" -UCLIBCXX_RUNTIME_BIN_SUBDIR="/bin" -UCLIBCXX_EXCEPTION_SUPPORT=y -IMPORT_LIBSUP=y -# IMPORT_LIBGCC_EH is not set -BUILD_STATIC_LIB=y -# BUILD_ONLY_STATIC_LIB is not set -# DODEBUG is not set diff --git a/package/uclibc++/patches/002-path_to_bash.patch b/package/uclibc++/patches/002-path_to_bash.patch deleted file mode 100644 index 26d88ee4d..000000000 --- a/package/uclibc++/patches/002-path_to_bash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/Makefile -+++ b/bin/Makefile -@@ -13,7 +13,7 @@ install: - $(INSTALL) -m 755 $(WRAPPER) $(PREFIX)$(UCLIBCXX_RUNTIME_BINDIR) - - $(WRAPPER): Makefile -- echo '#!/bin/sh' > $@ -+ echo '#!/usr/bin/env bash' > $@ - echo '' >> $@ - echo 'WRAPPER_INCLUDEDIR="$${WRAPPER_INCLUDEDIR:=-I$(UCLIBCXX_RUNTIME_INCLUDEDIR)}"' >> $@ - echo 'WRAPPER_LIBDIR="$${WRAPPER_LIBDIR:=-L$(UCLIBCXX_RUNTIME_LIBDIR)}"' >> $@ diff --git a/package/uclibc++/patches/006-eabi_fix.patch b/package/uclibc++/patches/006-eabi_fix.patch deleted file mode 100644 index 65b436cde..000000000 --- a/package/uclibc++/patches/006-eabi_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- a/include/typeinfo -+++ b/include/typeinfo -@@ -44,6 +44,7 @@ namespace __cxxabiv1 - class __class_type_info; - } // namespace __cxxabiv1 - -+#ifndef __GXX_MERGED_TYPEINFO_NAMES - #if !__GXX_WEAK__ - // If weak symbols are not supported, typeinfo names are not merged. - #define __GXX_MERGED_TYPEINFO_NAMES 0 -@@ -51,6 +52,7 @@ namespace __cxxabiv1 - // On platforms that support weak symbols, typeinfo names are merged. - #define __GXX_MERGED_TYPEINFO_NAMES 1 - #endif -+#endif - - namespace std - { ---- a/include/unwind-cxx.h -+++ b/include/unwind-cxx.h -@@ -173,6 +173,7 @@ extern std::unexpected_handler __unexpec -
- // This is the exception class we report -- "GNUCC++\0".
- const _Unwind_Exception_Class __gxx_exception_class
-+#ifndef __ARM_EABI_UNWINDER__
- = ((((((((_Unwind_Exception_Class) 'G'
- << 8 | (_Unwind_Exception_Class) 'N')
- << 8 | (_Unwind_Exception_Class) 'U')
-@@ -181,6 +182,9 @@ const _Unwind_Exception_Class __gxx_exce - << 8 | (_Unwind_Exception_Class) '+')
- << 8 | (_Unwind_Exception_Class) '+')
- << 8 | (_Unwind_Exception_Class) '\0');
-+#else
-+= "GNUC++";
-+#endif
-
- // GNU C++ personality routine, Version 0.
- extern "C" _Unwind_Reason_Code __gxx_personality_v0
|