From 03373a3d83d8c8d6cbc6e0a74b3434ef695e4c22 Mon Sep 17 00:00:00 2001 From: Sam Bingner Date: Mon, 6 May 2019 12:03:45 -1000 Subject: Build system updates --- data/file/make.sh | 4 ++-- data/libapt-dev/_metadata/provides | 1 - data/libapt-pkg-dev/_metadata/provides | 1 - data/libapt-pkg5.0/_metadata/bzip2.dep | 1 - data/libapt-pkg5.0/_metadata/depends | 1 + data/libapt-pkg5.0/_metadata/lz4.dep | 1 - data/libapt-pkg5.0/_metadata/lzma.dep | 1 - data/libapt-pkg5.0/_metadata/provides | 2 +- data/libapt-pkg5.0/_metadata/xz.dep | 1 - data/libapt/_metadata/breaks | 2 +- data/lz4/make.sh | 2 +- data/ncurses/clang.diff | 43 ---------------------------------- data/readline/make.sh | 2 +- data/xar/make.sh | 4 ++-- data/xz/make.sh | 2 +- 15 files changed, 10 insertions(+), 58 deletions(-) delete mode 100644 data/libapt-dev/_metadata/provides delete mode 100644 data/libapt-pkg-dev/_metadata/provides delete mode 120000 data/libapt-pkg5.0/_metadata/bzip2.dep create mode 100644 data/libapt-pkg5.0/_metadata/depends delete mode 120000 data/libapt-pkg5.0/_metadata/lz4.dep delete mode 120000 data/libapt-pkg5.0/_metadata/lzma.dep delete mode 120000 data/libapt-pkg5.0/_metadata/xz.dep delete mode 100644 data/ncurses/clang.diff diff --git a/data/file/make.sh b/data/file/make.sh index b3898e369..d926136e4 100644 --- a/data/file/make.sh +++ b/data/file/make.sh @@ -6,8 +6,8 @@ pkg:extract mv !(target) host cd host ./configure -make +make -j16 cd ../target pkg:configure -make FILE_COMPILE="$(pwd)"/../host/src/file +make -j16 FILE_COMPILE="$(pwd)"/../host/src/file pkg:install diff --git a/data/libapt-dev/_metadata/provides b/data/libapt-dev/_metadata/provides deleted file mode 100644 index f4468b354..000000000 --- a/data/libapt-dev/_metadata/provides +++ /dev/null @@ -1 +0,0 @@ -libapt-pkg (=1.4.8) diff --git a/data/libapt-pkg-dev/_metadata/provides b/data/libapt-pkg-dev/_metadata/provides deleted file mode 100644 index f4468b354..000000000 --- a/data/libapt-pkg-dev/_metadata/provides +++ /dev/null @@ -1 +0,0 @@ -libapt-pkg (=1.4.8) diff --git a/data/libapt-pkg5.0/_metadata/bzip2.dep b/data/libapt-pkg5.0/_metadata/bzip2.dep deleted file mode 120000 index 15aa44a77..000000000 --- a/data/libapt-pkg5.0/_metadata/bzip2.dep +++ /dev/null @@ -1 +0,0 @@ -../../bzip2 \ No newline at end of file diff --git a/data/libapt-pkg5.0/_metadata/depends b/data/libapt-pkg5.0/_metadata/depends new file mode 100644 index 000000000..babd358a6 --- /dev/null +++ b/data/libapt-pkg5.0/_metadata/depends @@ -0,0 +1 @@ +bzip2, lz4, lzma, xz diff --git a/data/libapt-pkg5.0/_metadata/lz4.dep b/data/libapt-pkg5.0/_metadata/lz4.dep deleted file mode 120000 index bccb2875c..000000000 --- a/data/libapt-pkg5.0/_metadata/lz4.dep +++ /dev/null @@ -1 +0,0 @@ -../../lz4 \ No newline at end of file diff --git a/data/libapt-pkg5.0/_metadata/lzma.dep b/data/libapt-pkg5.0/_metadata/lzma.dep deleted file mode 120000 index f84114cb9..000000000 --- a/data/libapt-pkg5.0/_metadata/lzma.dep +++ /dev/null @@ -1 +0,0 @@ -../../lzma \ No newline at end of file diff --git a/data/libapt-pkg5.0/_metadata/provides b/data/libapt-pkg5.0/_metadata/provides index f4468b354..f334e3557 100644 --- a/data/libapt-pkg5.0/_metadata/provides +++ b/data/libapt-pkg5.0/_metadata/provides @@ -1 +1 @@ -libapt-pkg (=1.4.8) +libapt-pkg (=%MYVERSION%) diff --git a/data/libapt-pkg5.0/_metadata/xz.dep b/data/libapt-pkg5.0/_metadata/xz.dep deleted file mode 120000 index d5eb7ae54..000000000 --- a/data/libapt-pkg5.0/_metadata/xz.dep +++ /dev/null @@ -1 +0,0 @@ -../../xz \ No newline at end of file diff --git a/data/libapt/_metadata/breaks b/data/libapt/_metadata/breaks index 425721f70..11f54d2b5 100644 --- a/data/libapt/_metadata/breaks +++ b/data/libapt/_metadata/breaks @@ -1 +1 @@ -cydia (<< 1.1.10), aptitude (<< 0.4.11.11-6), apt7-lib +cydia (<< 1.1.10), aptitude (<< 0.4.11.11-6), apt7-lib (<< 1:0) diff --git a/data/lz4/make.sh b/data/lz4/make.sh index 654c78332..1d6eee2d0 100644 --- a/data/lz4/make.sh +++ b/data/lz4/make.sh @@ -6,7 +6,7 @@ set(CMAKE_CROSSCOMPILING true) #include(CMakeForceCompiler) # Prefix detection only works with compiler id "GNU" # CMake will look for prefixed g++, cpp, ld, etc. automatically -set(CMAKE_SYSTEM_PROCESSOR aarch64) +set(CMAKE_SYSTEM_PROCESSOR ${PKG_TARG%%-*}) set(triple ${PKG_TARG}) set(CMAKE_FIND_ROOT_PATH $(echo ${PKG_PATH} | sed -e s/:/' '/g)) set(CMAKE_LIBRARY_PATH $(echo ${LIBRARY_PATH} | sed -e s/:/' '/g)) diff --git a/data/ncurses/clang.diff b/data/ncurses/clang.diff deleted file mode 100644 index 407410221..000000000 --- a/data/ncurses/clang.diff +++ /dev/null @@ -1,43 +0,0 @@ -diff -ruNp ncurses-5.8.orig/c++/cursesf.h ncurses-5.8/c++/cursesf.h ---- ncurses-5.8.orig/c++/cursesf.h 2005-08-13 21:08:24.000000000 +0300 -+++ ncurses-5.8/c++/cursesf.h 2011-04-03 18:29:29.000000000 +0300 -@@ -681,7 +681,7 @@ public: - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Fields=FALSE) -- : NCursesForm (Fields, with_frame, autoDelete_Fields) { -+ : NCursesForm (&Fields, with_frame, autoDelete_Fields) { - if (form) - set_user (const_cast(p_UserData)); - }; -@@ -694,7 +694,7 @@ public: - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Fields=FALSE) -- : NCursesForm (Fields, nlines, ncols, begin_y, begin_x, -+ : NCursesForm (&Fields, nlines, ncols, begin_y, begin_x, - with_frame, autoDelete_Fields) { - if (form) - set_user (const_cast(p_UserData)); -diff -ruNp ncurses-5.8.orig/c++/cursesm.h ncurses-5.8/c++/cursesm.h ---- ncurses-5.8.orig/c++/cursesm.h 2005-08-13 21:10:36.000000000 +0300 -+++ ncurses-5.8/c++/cursesm.h 2011-04-03 18:31:42.000000000 +0300 -@@ -639,7 +639,7 @@ public: - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE, - bool autoDelete_Items=FALSE) -- : NCursesMenu (Items, with_frame, autoDelete_Items) { -+ : NCursesMenu (&Items, with_frame, autoDelete_Items) { - if (menu) - set_user (const_cast(p_UserData)); - }; -@@ -651,7 +651,7 @@ public: - int begin_x = 0, - const T* p_UserData = STATIC_CAST(T*)(0), - bool with_frame=FALSE) -- : NCursesMenu (Items, nlines, ncols, begin_y, begin_x, with_frame) { -+ : NCursesMenu (&Items, nlines, ncols, begin_y, begin_x, with_frame) { - if (menu) - set_user (const_cast(p_UserData)); - }; - diff --git a/data/readline/make.sh b/data/readline/make.sh index 303c3741a..202e6c796 100644 --- a/data/readline/make.sh +++ b/data/readline/make.sh @@ -8,7 +8,7 @@ done pkg:patch autoconf pkg:configure ac_cv_func_strcoll_works=yes bash_cv_func_sigsetjmp=present bash_cv_func_ctype_nonascii=no bash_cv_must_reinstall_sighandlers=no bash_cv_func_strcoll_broken=yes -make CFLAGS='-O2' +pkg:make CFLAGS='-O2' pkg:install pkg: ln -s libreadline.5.2.dylib /usr/lib/libreadline.5.dylib pkg: ln -s libreadline.6.0.dylib /usr/lib/libreadline.5.2.dylib diff --git a/data/xar/make.sh b/data/xar/make.sh index 4da9aa1a4..da055f6b5 100644 --- a/data/xar/make.sh +++ b/data/xar/make.sh @@ -1,5 +1,5 @@ pkg:setup cp ${PKG_BASE}/config.sub . -pkg:configure --with-xml2-config="$(PKG_DEST_ libxml2)/usr/bin/xml2-config" --with-lzma="$(PKG_DEST_ liblzma)/usr" -make +pkg:configure CPPFLAGS="$("$(PKG_DEST_ libxml2)/usr/bin/xml2-config" --cflags | sed -e "s^/usr/^$(PKG_DEST_ _libxml2)/usr/^")" --with-xml2-config="$(PKG_DEST_ libxml2)/usr/bin/xml2-config" --with-lzma="$(PKG_DEST_ liblzma)/usr" +pkg:make pkg:install diff --git a/data/xz/make.sh b/data/xz/make.sh index 0bc0e75e5..ef4d2e144 100644 --- a/data/xz/make.sh +++ b/data/xz/make.sh @@ -3,4 +3,4 @@ pkg:setup pkg:configure --disable-lzmadec --disable-lzmainfo --disable-lzma-links --libdir="\${exec_prefix}/local/lib" make -j8 pkg:install -pkg: sed -ie 's|/usr/local/lib|${prefix}/local/lib|' /usr/local/lib/pkgconfig/liblzma.pc +pkg: sed -ie 's^/usr/local/lib^${prefix}/local/lib^' /usr/local/lib/pkgconfig/liblzma.pc -- cgit v1.2.3