API tools faq
paste
Advertisement
svenhoefer

Untitled

svenhoefer
May 15th, 2017
198
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 12.02 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/archive-patches/ct-ng-coolstream_hd1-new.config b/archive-patches/ct-ng-coolstream_hd1-new.config
  2. index 582cf10..7c2f9d5 100644
  3. --- a/archive-patches/ct-ng-coolstream_hd1-new.config
  4. +++ b/archive-patches/ct-ng-coolstream_hd1-new.config
  5. @@ -443,7 +443,7 @@ CT_LIBC_EGLIBC_V_2_13=y
  6.  CT_EGLIBC_REVISION="HEAD"
  7.  # CT_EGLIBC_HTTP is not set
  8.  # CT_EGLIBC_CHECKOUT is not set
  9. -# CT_EGLIBC_OPT_SIZE is not set
  10. +CT_EGLIBC_OPT_SIZE=y
  11.  # CT_EGLIBC_CUSTOM_CONFIG is not set
  12.  CT_LIBC_newlib_AVAILABLE=y
  13.  CT_LIBC_uClibc_AVAILABLE=y
  14. diff --git a/make/environment.mk b/make/environment.mk
  15. index 7b43002..d7eed5c 100644
  16. --- a/make/environment.mk
  17. +++ b/make/environment.mk
  18. @@ -95,12 +95,13 @@ endif
  19.  STATICLIB             = $(STATIC_DIR)/lib
  20.  TARGETLIB             = $(TARGETPREFIX)/lib
  21.  TARGETINCLUDE         = $(TARGETPREFIX)/include
  22. -TARGET_CFLAGS         = -pipe -O2 -g -I$(TARGETINCLUDE)
  23. -TARGET_CFLAGS_SMALL   = -pipe -Os -g -I$(TARGETINCLUDE)
  24. +TARGET_OFLAG          = -O2
  25. +ifeq ($(BOXSERIES), hd1)
  26. +  TARGET_OFLAG        = -Os
  27. +endif
  28. +TARGET_CFLAGS         = -pipe $(TARGET_OFLAG) -g -I$(TARGETINCLUDE)
  29.  TARGET_CPPFLAGS       = $(TARGET_CFLAGS)
  30. -TARGET_CPPFLAGS_SMALL = $(TARGET_CFLAGS_SMALL)
  31.  TARGET_CXXFLAGS       = $(TARGET_CFLAGS)
  32. -TARGET_CXXFLAGS_SMALL = $(TARGET_CFLAGS_SMALL)
  33.  TARGET_LDFLAGS        = -Wl,-O1 -L$(TARGETLIB)
  34.  TARGET_LDFLAGS_RPATH  = -Wl,-O1 -L$(TARGETLIB) -Wl,-rpath-link,$(TARGETLIB)
  35.  LD_FLAGS              = $(TARGET_LDFLAGS)
  36. @@ -144,18 +145,6 @@ CONFIGURE = \
  37.     $(BUILDENV) \
  38.     ./configure $(CONFIGURE_OPTS)
  39.  
  40. -BUILDENV_SMALL = \
  41. -   CFLAGS="$(TARGET_CFLAGS_SMALL)" \
  42. -   CPPFLAGS="$(TARGET_CPPFLAGS_SMALL)" \
  43. -   CXXFLAGS="$(TARGET_CXXFLAGS_SMALL)" \
  44. -   LDFLAGS="$(TARGET_LDFLAGS)" \
  45. -   PKG_CONFIG_PATH=$(PKG_CONFIG_PATH)
  46. -
  47. -CONFIGURE_SMALL = \
  48. -   test -f ./configure || ./autogen.sh && \
  49. -   $(BUILDENV_SMALL) \
  50. -   ./configure $(CONFIGURE_OPTS)
  51. -
  52.  BUILDENV_RPATH = \
  53.     CFLAGS="$(TARGET_CFLAGS)" \
  54.     CPPFLAGS="$(TARGET_CPPFLAGS)" \
  55. diff --git a/make/neutrino.mk b/make/neutrino.mk
  56. index ce5ecfe..9108e0a 100644
  57. --- a/make/neutrino.mk
  58. +++ b/make/neutrino.mk
  59. @@ -18,11 +18,7 @@ endif
  60.  ifeq ($(DEBUG), yes)
  61.     N_CFLAGS += -ggdb3 -rdynamic
  62.  else
  63. -  ifeq ($(BOXSERIES), hd2)
  64. -   N_CFLAGS += -g -O2
  65. -  else
  66. -   N_CFLAGS += -g -Os
  67. -  endif
  68. +   N_CFLAGS += -g $(TARGET_OFLAG)
  69.  endif
  70.  
  71.  NEUTRINO_PKG_DEPS =
  72. @@ -33,7 +29,7 @@ N_LDFLAGS = -L$(TARGETLIB) -lcrypto -ldl -lz $(CORTEX-STRINGS)
  73.  ifeq ($(DEBUG), yes)
  74.     N_LDFLAGS += -Wl,-rpath-link,$(TARGETLIB)
  75.  else
  76. -   N_LDFLAGS += -Wl,-O2,-rpath-link,$(TARGETLIB)
  77. +   N_LDFLAGS += -Wl,-O1,-rpath-link,$(TARGETLIB)
  78.  endif
  79.  
  80.  N_CONFIGURE_DEBUG =
  81. diff --git a/make/plugins-extra.mk b/make/plugins-extra.mk
  82. index 38011f9..75d2a1f 100644
  83. --- a/make/plugins-extra.mk
  84. +++ b/make/plugins-extra.mk
  85. @@ -15,7 +15,7 @@ $(LIBPLUG)/links.so: $(D)/libpng $(LIBPLUG) $(VARCONF)
  86.         export SYSROOT=$(TARGETPREFIX) && \
  87.         export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \
  88.         export LD_LIBRARY_PATH=$(TARGETLIB) && \
  89. -       export CFLAGS="-pipe -Os -g -I$(TARGETINCLUDE)" && \
  90. +       export CFLAGS="-pipe $(TARGET_OFLAG) -g -I$(TARGETINCLUDE)" && \
  91.         export LIBS="$(CORTEX-STRINGS) -Wl,-O1 -L$(TARGETLIB)" && \
  92.         ./configure \
  93.             --host=$(TARGET) \
  94. diff --git a/make/system-libs.mk b/make/system-libs.mk
  95. index 83a9d13..fa2fb6a 100644
  96. --- a/make/system-libs.mk
  97. +++ b/make/system-libs.mk
  98. @@ -402,7 +402,7 @@ $(D)/openthreads: $(SOURCE_DIR)/$(REPO_OPENTHREADS) | $(TARGETPREFIX)
  99.         cmake . -DCMAKE_BUILD_TYPE="None" \
  100.             -DCMAKE_SYSTEM_NAME="Linux" \
  101.             -DCMAKE_SYSTEM_PROCESSOR="arm" \
  102. -           -DCMAKE_CXX_FLAGS="-O2 -DNDEBUG $(OPENTHREADS_CONFIGURE)" \
  103. +           -DCMAKE_CXX_FLAGS="$(TARGET_OFLAG) -DNDEBUG $(OPENTHREADS_CONFIGURE)" \
  104.             -DCMAKE_INSTALL_PREFIX="" \
  105.             -DCMAKE_C_COMPILER="$(TARGET)-gcc" \
  106.             -DCMAKE_CXX_COMPILER="$(TARGET)-g++" \
  107. diff --git a/make/system-tools-extra.mk b/make/system-tools-extra.mk
  108. index c9a9379..742c4af 100644
  109. --- a/make/system-tools-extra.mk
  110. +++ b/make/system-tools-extra.mk
  111. @@ -3,7 +3,7 @@
  112.  $(D)/binutils: $(ARCHIVE)/binutils-$(BINUTILS_VER).tar.bz2 | $(TARGETPREFIX)
  113.     $(UNTAR)/binutils-$(BINUTILS_VER).tar.bz2
  114.     cd $(BUILD_TMP)/binutils-$(BINUTILS_VER) && \
  115. -       $(CONFIGURE_SMALL) --target=$(TARGET) \
  116. +       $(CONFIGURE) --target=$(TARGET) \
  117.             --prefix= \
  118.             --disable-multilib \
  119.             --disable-werror \
  120. diff --git a/make/system-tools.mk b/make/system-tools.mk
  121. index 4a86083..a4d003d 100644
  122. --- a/make/system-tools.mk
  123. +++ b/make/system-tools.mk
  124. @@ -5,7 +5,7 @@ openvpn: openvpn-$(BOXSERIES)
  125.  $(D)/openvpn-hd2: $(D)/lzo $(D)/openssl $(ARCHIVE)/openvpn-$(OPENVPN_VER).tar.xz | $(TARGETPREFIX)
  126.     $(UNTAR)/openvpn-$(OPENVPN_VER).tar.xz
  127.     cd $(BUILD_TMP)/openvpn-$(OPENVPN_VER) && \
  128. -   $(BUILDENV_SMALL) ./configure \
  129. +   $(BUILDENV) ./configure \
  130.         --build=$(BUILD) \
  131.         --host=$(TARGET) \
  132.         --prefix= \
  133. @@ -33,7 +33,7 @@ $(D)/openssh: $(D)/openssl $(D)/zlib $(ARCHIVE)/openssh-$(OPENSSH_VER).tar.gz |
  134.     $(UNTAR)/openssh-$(OPENSSH_VER).tar.gz
  135.     cd $(BUILD_TMP)/openssh-$(OPENSSH_VER) && \
  136.     export ac_cv_search_dlopen=no && \
  137. -   $(BUILDENV_SMALL) ./configure \
  138. +   $(BUILDENV) ./configure \
  139.         --build=$(BUILD) \
  140.         --host=$(TARGET) \
  141.         --prefix= \
  142. @@ -172,7 +172,7 @@ $(D)/coreutils: $(ARCHIVE)/coreutils-$(COREUTILS_VER).tar.xz | $(TARGETPREFIX)
  143.     cd $(BUILD_TMP)/coreutils-$(COREUTILS_VER) && \
  144.         $(PATCH)/coreutils-fix-coolstream-build.patch && \
  145.         autoreconf -fi && \
  146. -       $(CONFIGURE_SMALL) --target=$(TARGET) \
  147. +       $(CONFIGURE) --target=$(TARGET) \
  148.             --prefix= \
  149.             --enable-silent-rules \
  150.             --disable-xattr \
  151. @@ -260,7 +260,7 @@ $(D)/smartmontools: $(ARCHIVE)/smartmontools-$(SMARTMON_VER).tar.gz | $(TARGETPR
  152.     $(UNTAR)/smartmontools-$(SMARTMON_VER).tar.gz
  153.     cd $(BUILD_TMP)/smartmontools-$(SMARTMON_VER) && \
  154.         $(BUILDENV) \
  155. -       $(CONFIGURE_SMALL) --target=$(TARGET) --prefix= && \
  156. +       $(CONFIGURE) --target=$(TARGET) --prefix= && \
  157.         $(MAKE) && \
  158.         install -m755 smartctl $(TARGETPREFIX)/sbin/smartctl
  159.     $(REMOVE)/smartmontools-$(SMARTMON_VER)
  160. @@ -295,7 +295,7 @@ $(D)/vsftpd: $(ARCHIVE)/vsftpd-3.0.3.tar.gz | $(TARGETPREFIX)
  161.         $(PATCH)/vsftpd.diff && \
  162.         $(PATCH)/vsftpd-ssl.diff && \
  163.         make clean && \
  164. -       TARGETPREFIX=$(TARGETPREFIX) make CC=$(TARGET)-gcc LIBS="-lcrypt -lcrypto -lssl" CFLAGS="-pipe -O2 -g -I$(TARGETINCLUDE)" LDFLAGS="$(TARGET_LDFLAGS_RPATH)"
  165. +       TARGETPREFIX=$(TARGETPREFIX) make CC=$(TARGET)-gcc LIBS="-lcrypt -lcrypto -lssl" CFLAGS="-pipe $(TARGET_OFLAG) -g -I$(TARGETINCLUDE)" LDFLAGS="$(TARGET_LDFLAGS_RPATH)"
  166.     install -d $(TARGETPREFIX)/share/empty
  167.     install -D -m 755 $(BUILD_TMP)/vsftpd-3.0.3/vsftpd $(TARGETPREFIX)/sbin/vsftpd
  168.     install -D -m 644 $(SCRIPTS)/vsftpd.conf $(TARGETPREFIX)/etc/vsftpd.conf
  169. @@ -336,7 +336,7 @@ $(D)/minicom: $(D)/libncurses $(ARCHIVE)/minicom-$(MINICOM_VER).tar.gz | $(TARGE
  170.     $(UNTAR)/minicom-$(MINICOM_VER).tar.gz
  171.     cd $(BUILD_TMP)/minicom-$(MINICOM_VER) && \
  172.         $(PATCH)/minicom-fix-h-v-return-value-is-not-0.patch && \
  173. -       $(CONFIGURE_SMALL) \
  174. +       $(CONFIGURE) \
  175.             --prefix= \
  176.             --target=$(TARGET) \
  177.             --disable-nls && \
  178. @@ -388,7 +388,7 @@ $(D)/bash: $(ARCHIVE)/bash-$(BASH_VER).tar.gz | $(TARGETPREFIX)
  179.         for patch in $(PATCHES)/bash-$(BASH_MAJOR).$(BASH_MINOR)/*; do \
  180.             patch -p0 -i $$patch; \
  181.         done; \
  182. -       $(CONFIGURE_SMALL) && \
  183. +       $(CONFIGURE) && \
  184.         $(MAKE) && \
  185.         install -m 755 bash $(TARGETPREFIX)/bin
  186.     $(REMOVE)/bash-$(BASH_VER)
  187. @@ -398,7 +398,7 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
  188.     $(UNTAR)/e2fsprogs-$(E2FSPROGS_VER).tar.gz
  189.     cd $(BUILD_TMP)/e2fsprogs-$(E2FSPROGS_VER) && \
  190.         autoreconf -fi && \
  191. -       $(CONFIGURE_SMALL) \
  192. +       $(CONFIGURE) \
  193.             --target=$(TARGET) \
  194.             --prefix=/ \
  195.             --infodir=/.remove \
  196. @@ -431,7 +431,7 @@ $(D)/e2fsprogs: $(ARCHIVE)/e2fsprogs-$(E2FSPROGS_VER).tar.gz | $(TARGETPREFIX)
  197.  $(D)/ntfs-3g: $(ARCHIVE)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz | $(TARGETPREFIX)
  198.     $(UNTAR)/ntfs-3g_ntfsprogs-$(NTFS3G_VER).tgz
  199.     cd $(BUILD_TMP)/ntfs-3g_ntfsprogs-$(NTFS3G_VER) && \
  200. -       CFLAGS="-pipe -Os -g" ./configure \
  201. +       CFLAGS="-pipe $(TARGET_OFLAG) -g" ./configure \
  202.             --build=$(BUILD) \
  203.             --host=$(TARGET) \
  204.             --prefix= \
  205. @@ -496,7 +496,7 @@ $(D)/samba-hd1: $(ARCHIVE)/samba-2.2.12.tar.gz | $(TARGETPREFIX)
  206.             $(TARGETLIB)/codepages/unicode_map.ISO8859-15
  207.     $(MAKE) -C $(BUILD_TMP)/samba-2.2.12/source distclean
  208.     cd $(BUILD_TMP)/samba-2.2.12/source && \
  209. -       $(BUILDENV_SMALL) \
  210. +       $(BUILDENV) \
  211.         ./configure \
  212.             --build=$(BUILD) \
  213.             --host=$(TARGET) \
  214. @@ -537,7 +537,7 @@ $(D)/samba-hd2: $(ARCHIVE)/samba-3.3.9.tar.gz $(D)/libiconv | $(TARGETPREFIX)
  215.         cd source && \
  216.         export CONFIG_SITE=$(PATCHES)/samba-3.3.9-config.site && \
  217.         ./autogen.sh && \
  218. -       $(CONFIGURE_SMALL) \
  219. +       $(CONFIGURE) \
  220.             --build=$(BUILD) \
  221.             --host=$(TARGET) \
  222.             --target=$(TARGET) \
  223. @@ -590,7 +590,7 @@ $(D)/dropbear: $(D)/zlib $(ARCHIVE)/dropbear-$(DROPBEAR_VER).tar.bz2 | $(TARGETP
  224.  $(D)/sg3-utils: $(ARCHIVE)/sg3_utils-$(SG3-UTILS_VER).tar.xz | $(TARGETPREFIX)
  225.     $(UNTAR)/sg3_utils-$(SG3-UTILS_VER).tar.xz
  226.     cd $(BUILD_TMP)/sg3_utils-$(SG3-UTILS_VER) && \
  227. -       $(CONFIGURE_SMALL) --prefix= --mandir=/.remove && \
  228. +       $(CONFIGURE) --prefix= --mandir=/.remove && \
  229.         $(MAKE) && \
  230.         cp -a src/.libs/sg_start $(TARGETPREFIX)/bin && \
  231.         cp -a lib/.libs/libsgutils2.so.2.0.0 $(TARGETLIB) && \
  232. @@ -636,7 +636,7 @@ $(D)/wpa_supplicant: $(D)/openssl $(ARCHIVE)/wpa_supplicant-0.7.3.tar.gz | $(TAR
  233.     $(UNTAR)/wpa_supplicant-0.7.3.tar.gz
  234.     pushd $(BUILD_TMP)/wpa_supplicant-0.7.3/wpa_supplicant && \
  235.         cp $(PATCHES)/wpa_supplicant_config .config && \
  236. -       CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS_SMALL)" CXXFLAGS="$(TARGET_CXXFLAGS_SMALL)" LDFLAGS="$(TARGET_LDFLAGS)" \
  237. +       CC=$(TARGET)-gcc CFLAGS="$(TARGET_CFLAGS)" CXXFLAGS="$(TARGET_CXXFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
  238.         $(MAKE)
  239.     cp -f $(BUILD_TMP)/wpa_supplicant-0.7.3/wpa_supplicant/wpa_cli $(TARGETPREFIX)/sbin/wpa_cli
  240.     cp -f $(BUILD_TMP)/wpa_supplicant-0.7.3/wpa_supplicant/wpa_passphrase $(TARGETPREFIX)/sbin/wpa_passphrase
  241. @@ -715,7 +715,7 @@ $(D)/bc: $(ARCHIVE)/bc-1.06.tar.gz | $(TARGETPREFIX)
  242.     $(UNTAR)/bc-1.06.tar.gz
  243.     cd $(BUILD_TMP)/bc-1.06 && \
  244.         autoreconf -fi && \
  245. -       $(CONFIGURE_SMALL) \
  246. +       $(CONFIGURE) \
  247.             --target=$(TARGET) \
  248.             --prefix= \
  249.             --mandir=/.remove \
  250. @@ -731,7 +731,7 @@ $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-007.tar.xz | $(TARGETPREFI
  251.     cd $(BUILD_TMP)//usbutils-007 && \
  252.     $(PATCH)/usbutils-avoid-dependency-on-bash.patch && \
  253.     $(PATCH)/usbutils-fix-null-pointer-crash.patch && \
  254. -       $(CONFIGURE_SMALL) \
  255. +       $(CONFIGURE) \
  256.             --target=$(TARGET) \
  257.             --prefix= \
  258.             --mandir=/.remove \
  259. @@ -746,7 +746,7 @@ $(D)/usbutils: $(D)/libusb_compat $(ARCHIVE)/usbutils-007.tar.xz | $(TARGETPREFI
  260.     $(REMOVE)/usbutils-007
  261.     touch $@
  262.  
  263. -DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS_SMALL) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
  264. +DOSFSTOOLS_CFLAGS = $(TARGET_CFLAGS) -D_GNU_SOURCE -fomit-frame-pointer -D_FILE_OFFSET_BITS=64
  265.  DOSFSTOOLS_DEPS =
  266.  DOSFSTOOLS_LDFLAGS = $(TARGET_LDFLAGS)
  267.  ifeq ($(BOXSERIES), hd2)
  268. @@ -758,7 +758,7 @@ $(D)/dosfstools: $(DOSFSTOOLS_DEPS) $(ARCHIVE)/dosfstools-$(DOSFSTOOLS_VER).tar.
  269.     $(UNTAR)/dosfstools-$(DOSFSTOOLS_VER).tar.xz
  270.     set -e; cd $(BUILD_TMP)/dosfstools-$(DOSFSTOOLS_VER); \
  271.         autoreconf -fi; \
  272. -       $(CONFIGURE_SMALL) \
  273. +       $(CONFIGURE) \
  274.             --prefix= \
  275.             --mandir=/.remove \
  276.             --docdir=/.remove \
  277. @@ -842,7 +842,7 @@ $(D)/wget: $(D)/libiconv $(D)/openssl $(ARCHIVE)/wget-$(WGET_VER).tar.gz | $(TAR
  278.     $(PATCH)/wget-$(WGET_VER)-remove-hardcoded-engine-support-for-openss.patch && \
  279.     $(PATCH)/wget-$(WGET_VER)-set-check_cert-false-by-default.patch && \
  280.     $(PATCH)/wget-$(WGET_VER)-change_DEFAULT_LOGFILE.patch && \
  281. -       $(CONFIGURE_SMALL) \
  282. +       $(CONFIGURE) \
  283.             --target=$(TARGET) \
  284.             --prefix= \
  285.             --datarootdir=/.remove \
  286. @@ -901,7 +901,7 @@ $(D)/exfat-utils: $(ARCHIVE)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz $(D)/fuse-exf
  287.     $(UNTAR)/exfat-utils-$(EXFAT_UTILS_VER).tar.gz
  288.     pushd $(BUILD_TMP)/exfat-utils-$(EXFAT_UTILS_VER); \
  289.         autoreconf -fi; \
  290. -       $(CONFIGURE_SMALL) \
  291. +       $(CONFIGURE) \
  292.             --prefix= \
  293.             --docdir=/.remove \
  294.             --mandir=/.remove \
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!