diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/rt.lib b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/rt.lib new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/rt.lib @@ -0,0 +1 @@ + diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/socket.lib b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/socket.lib new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/socket.lib @@ -0,0 +1 @@ + diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysclock.lib b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysclock.lib new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysclock.lib @@ -0,0 +1 @@ + diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps new file mode 100644 index 000000000..fd154d05f --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps @@ -0,0 +1,38 @@ +target: x86_64-unknown-linux-musl +clockrt: yes +clockmon: yes +endianness: little +sizeofushort: 2 +sizeofuint: 4 +sizeofulong: 8 +sizeofgid: 4 +sizeoftime: 8 +accept4: yes +ancilautoclose: no +cmsgcloexec: yes +devurandom: yes +eproto: yes +eventfd: yes +flock: yes +getpeerid: yes +sopeercred: yes +getpeerucred: no +ipv6: yes +malloc0: yes +msgdontwait: yes +nbwaitall: yes +openat: yes +linkat: yes +pipe2: yes +posixspawn: yes +ppoll: yes +revoke: no +sendfile: yes +setgroups: yes +settimeofday: yes +signalfd: yes +splica: yes +strcasestr: yes +strnlen: yes +uint64t: yes +devrandom:yes diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps.h b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps.h new file mode 100644 index 000000000..66e092aa0 --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps.h @@ -0,0 +1,65 @@ +/* + * --- SDE-COPYRIGHT-NOTE-BEGIN --- + * This copyright note is auto-generated by ./scripts/Create-CopyPatch. + * + * Filename: package/.../skalibs/cross_sysdeps/x86_64-unknown-linux-musl/sysdeps.h + * Copyright (C) 2015 The OpenSDE Project + * + * More information can be found in the files COPYING and README. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. A copy of the + * GNU General Public License can be found in the file COPYING. + * --- SDE-COPYRIGHT-NOTE-END --- + */ + +/* ISC license. */ + +#ifndef SYSDEPS_H +#define SYSDEPS_H + +#define SKALIBS_TARGET "x86_64-unknown-linux-musl" +#define SKALIBS_HASCLOCKRT +#define SKALIBS HASCLOCKMON +#define SKALIBS_ENDIANNESS "little" +#define SKALIBS_SIZEOFUSHORT 2 +#define SKALIBS_USHORT_BITS 16 +#define SKALIBS_SIZEOFUINT 4 +#define SKALIBS_UINT_BITS 32 +#define SKALIBS_SIZEOFULONG 8 +#define SKALIBS_ULONG_BITS 64 +#define SKALIBS_SIZEOFGID 4 +#define SKALIBS_GID_BITS 32 +#define SKALIBS_SIZEOFTIME 8 +#define SKALIBS_TIME_BITS 64 +#define SKALIBS_HASACCEPT4 +#undef SKALIBS_HASANCILAUTOCLOSE +#define SKALIBS_HASMSGCLOEXEC +#define SKALIBS_HASDEVURANDOM +#define SKALIBS_HAS_EPROTO +#define SKALIBS_HAS_EVENTFD +#define SKALIBS_HASFLOCK +#undef SKALIBS_HASGETPEERID +#define SKALIBS_HASSOPEERCRED +#undef SKALIBS_HASGETPEERUCRED +#define SKALIBS_HASIPV6 +#define SKALIBS_HASMALLOC0 +#define SKALIBS_HASMSGDONTWAIT +#define SKALIBS_HASNBWAITALL +#define SKALIBS_HASOPENAT +#define SKALIBS_HASLINKAT +#define SKALIBS_HASPIPE2 +#define SKALIBS_HASPOSIXSPAWN +#define SKALIBS_HASPPOLL +#undef SKALIBS_HASREVOKE +#define SKALIBS_HASSENDFILE +#define SKALIBS_HASSETGROUPS +#define SKALIBS_HASSETTIMEOFDAY +#define SKALIBS_HASSIGNALFD +#define SKALIBS_HASSPLICE +#define SKALIBS_HASSTRCASESTR +#define SKALIBS_HASSTRLEN +#define SKALIBS_HASUINT64T +#define SKALIBS_HASDEVRANDOM +#endif diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/tainnow.lib b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/tainnow.lib new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/tainnow.lib @@ -0,0 +1 @@ + diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/target b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/target new file mode 100644 index 000000000..55523287b --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/target @@ -0,0 +1 @@ +x86_64-unknown-linux-musl diff --git a/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/util.lib b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/util.lib new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/develop/skalibs/cross_sysdeps/x86_64-unknown-linux-musl/util.lib @@ -0,0 +1 @@ + diff --git a/develop/skalibs/skalibs.conf b/develop/skalibs/skalibs.conf index 5aae236f5..48a4a5c06 100644 --- a/develop/skalibs/skalibs.conf +++ b/develop/skalibs/skalibs.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../skalibs/skalibs.conf -# Copyright (C) 2011 - 2013 The OpenSDE Project +# Copyright (C) 2011 - 2015 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -13,11 +13,13 @@ # --- SDE-COPYRIGHT-NOTE-END --- if [ "$prefix_auto" = 1 ]; then - prefix="usr" - set_confopt + prefix= + set_confopt fi -# skalibs is following slashpackage confentions -srcdir=prog/$pkg-$ver +cleanconfopt=0 + +if atstage cross; then + var_append extraconfopt ' ' '"--with-sysdeps=$confdir/cross_sysdeps/$arch_target"' +fi -includedir=/$prefix/include/skalibs diff --git a/develop/skalibs/skalibs.desc b/develop/skalibs/skalibs.desc index 5052b7fc9..f2a331b55 100644 --- a/develop/skalibs/skalibs.desc +++ b/develop/skalibs/skalibs.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../skalibs/skalibs.desc -[COPY] Copyright (C) 2011 - 2013 The OpenSDE Project +[COPY] Copyright (C) 2011 - 2015 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -27,9 +27,9 @@ [L] ISC [S] Stable -[V] 1.3.0 +[V] 2.3.6.1 [P] X -?---5---9 108.700 [O] . $base/package/*/*/skaware-conf.in -[D] 1922826570 skalibs-1.3.0.tar.gz http://www.skarnet.org/software/skalibs/ +[D] 2167640302 skalibs-2.3.6.1.tar.gz http://www.skarnet.org/software/skalibs/ diff --git a/develop/skalibs/skaware-conf.in b/develop/skalibs/skaware-conf.in index 8ea27de9b..878d56b01 100644 --- a/develop/skalibs/skaware-conf.in +++ b/develop/skalibs/skaware-conf.in @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../skalibs/skaware-conf.in -# Copyright (C) 2011 - 2013 The OpenSDE Project +# Copyright (C) 2011 - 2015 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -12,36 +12,18 @@ # GNU General Public License can be found in the file COPYING. # --- SDE-COPYRIGHT-NOTE-END --- -# do not run the useless configure script dummy -runconf=0 +# do not check configure options +cleanconfopt=0 skaware_conf() { - # configure build environment - echo "$CC" > conf-compile/conf-cc - echo "$CC" > conf-compile/conf-ld - echo "$CC" > conf-compile/conf-dynld - echo "$STRIP -R .note -R .comment -R .note.GNU-stack" > conf-compile/conf-stripbins - echo "$STRIP -x -R .note -R .comment -R .note.GNU-stack" > conf-compile/conf-striplibs - - # do not use slashpackage style fs layout if FHS is used - if pkginstalled fhs; then - local flag_slashpackage="conf-compile/flag-slashpackage" - [ -f $flag_slashpackage ] && rm -vf $flag_slashpackage - echo "$root$sysconfdir" > conf-compile/conf-etc - echo "$root$mandir" > conf-compile/conf-man - echo "$root$bindir" > conf-compile/conf-install-command - echo "$root$libdir" > conf-compile/conf-install-library - echo "$root$libdir" > conf-compile/conf-install-library.so - echo "$root$includedir" > conf-compile/conf-install-include - echo "$root$libdir/sysdeps" > conf-compile/conf-install-sysdeps - - # configure packages that depend on skalibs - if [ ! $pkg = "skalibs" ]; then - pkgprefix -t skalibs - echo "$( pkgprefix -r includedir skalibs )" > conf-compile/path-include - echo "$( pkgprefix -r libdir skalibs )" > conf-compile/path-library - echo "$( pkgprefix -r libdir skalibs )" > conf-compile/path-library.so - echo "$( pkgprefix -r libdir skalibs )/sysdeps" > conf-compile/import + # configure packages that depend on skalibs + if [ ! $pkg = "skalibs" ]; then + if atstage cross; then + pkgprefix -t skalibs + var_append confopt ' ' '--with-include=$root$( pkgprefix includedir skalibs )' + var_append confopt ' ' '--with-lib=$root/usr$( pkgprefix libdir skalibs )' + var_append confopt ' ' '--with-dynlib=$root/usr$( pkgprefix libdir skalibs )' + var_append confopt ' ' '--with-sysdeps=$root/usr$( pkgprefix libdir skalibs )/skalibs/sysdeps' fi fi }