mirror of
https://github.com/Mathewnd/Astral.git
synced 2026-11-02 15:38:22 +00:00
jinx: a BUNCH of ports related to xorg and the build system
This commit is contained in:
Matheus
@@ -0,0 +1,13 @@
|
||||
diff --git fontconfig-clean/src/fcstat.c fontconfig-workdir/src/fcstat.c
|
||||
index 4f69eae..03c1b95 100644
|
||||
--- fontconfig-clean/src/fcstat.c
|
||||
+++ fontconfig-workdir/src/fcstat.c
|
||||
@@ -386,7 +386,7 @@ FcFStatFs (int fd, FcStatFS *statb)
|
||||
# endif
|
||||
# if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
|
||||
p = buf.f_fstypename;
|
||||
-# elif defined(__linux__) || defined (__EMSCRIPTEN__)
|
||||
+# elif defined(__linux__) || defined (__EMSCRIPTEN__) || defined(__astral__)
|
||||
switch (buf.f_type)
|
||||
{
|
||||
case 0x6969: /* nfs */
|
||||
@@ -0,0 +1,31 @@
|
||||
diff --git libgpg-error-workdir/src/syscfg/lock-obj-pub.astral.h libgpg-error-workdir/src/syscfg/lock-obj-pub.astral.h
|
||||
new file mode 100644
|
||||
index 0000000..0dd6431
|
||||
--- /dev/null
|
||||
+++ libgpg-error-workdir/src/syscfg/lock-obj-pub.astral.h
|
||||
@@ -0,0 +1,25 @@
|
||||
+## lock-obj-pub.x86_64-pc-linux-gnu.h
|
||||
+## File created by gen-posix-lock-obj - DO NOT EDIT
|
||||
+## To be included by mkheader into gpg-error.h
|
||||
+
|
||||
+typedef struct
|
||||
+{
|
||||
+ long _vers;
|
||||
+ union {
|
||||
+ volatile char _priv[40];
|
||||
+ long _x_align;
|
||||
+ long *_xp_align;
|
||||
+ } u;
|
||||
+} gpgrt_lock_t;
|
||||
+
|
||||
+#define GPGRT_LOCK_INITIALIZER {1,{{0,0,0,0,0,0,0,0, \
|
||||
+ 0,0,0,0,0,0,0,0, \
|
||||
+ 0,0,0,0,0,0,0,0, \
|
||||
+ 0,0,0,0,0,0,0,0, \
|
||||
+ 0,0,0,0,0,0,0,0}}}
|
||||
+##
|
||||
+## Local Variables:
|
||||
+## mode: c
|
||||
+## buffer-read-only: t
|
||||
+## End:
|
||||
+##
|
||||
@@ -0,0 +1,138 @@
|
||||
diff --git libtool-clean/build-aux/ltmain.in libtool-workdir/build-aux/ltmain.in
|
||||
index a5f21a1..085711c 100644
|
||||
--- libtool-clean/build-aux/ltmain.in
|
||||
+++ libtool-workdir/build-aux/ltmain.in
|
||||
@@ -6497,7 +6497,7 @@ func_mode_link ()
|
||||
fi
|
||||
else
|
||||
# We cannot seem to hardcode it, guess we'll fake it.
|
||||
- add_dir=-L$libdir
|
||||
+ add_dir=-L$lt_sysroot$$libdir
|
||||
# Try looking first in the location we're being installed to.
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
case $libdir in
|
||||
diff --git libtool-clean/libtoolize.in libtool-workdir/libtoolize.in
|
||||
index 0c40fed..763619b 100644
|
||||
--- libtool-clean/libtoolize.in
|
||||
+++ libtool-workdir/libtoolize.in
|
||||
@@ -1891,7 +1891,7 @@ func_require_seen_libtool ()
|
||||
# Do not remove config.guess, config.sub or install-sh, we don't
|
||||
# install them without --install, and the project may not be using
|
||||
# Automake. Similarly, do not remove Gnulib files.
|
||||
- all_pkgaux_files="compile depcomp missing ltmain.sh"
|
||||
+ all_pkgaux_files=""
|
||||
all_pkgmacro_files="libtool.m4 ltargz.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
|
||||
all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__argz.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__argz.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
|
||||
|
||||
diff --git libtool-clean/m4/libtool.m4 libtool-workdir/m4/libtool.m4
|
||||
index 79a2451..1682c56 100644
|
||||
--- libtool-clean/m4/libtool.m4
|
||||
+++ libtool-workdir/m4/libtool.m4
|
||||
@@ -1696,7 +1696,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
|
||||
lt_cv_sys_max_cmd_len=12288; # 12K is about right
|
||||
;;
|
||||
|
||||
- gnu*)
|
||||
+ astral* | gnu*)
|
||||
# Under GNU Hurd, this test is not required because there is
|
||||
# no limit to the length of command line arguments.
|
||||
# Libtool will interpret -1 as no limit whatsoever
|
||||
@@ -2521,6 +2521,18 @@ amigaos*)
|
||||
esac
|
||||
;;
|
||||
|
||||
+astral*)
|
||||
+ version_type=linux
|
||||
+ need_lib_prefix=no
|
||||
+ need_version=no
|
||||
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
|
||||
+ soname_spec='$libname$release$shared_ext$major'
|
||||
+ dynamic_linker='mlibc ld.so'
|
||||
+ shlibpath_var=LD_LIBRARY_PATH
|
||||
+ shlibpath_overrides_runpath=no
|
||||
+ hardcode_into_libs=yes
|
||||
+ ;;
|
||||
+
|
||||
beos*)
|
||||
library_names_spec='$libname$shared_ext'
|
||||
dynamic_linker="$host_os ld.so"
|
||||
@@ -3468,6 +3480,10 @@ aix[[4-9]]*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
|
||||
+astral*)
|
||||
+ lt_cv_deplibs_check_method=pass_all
|
||||
+ ;;
|
||||
+
|
||||
beos*)
|
||||
lt_cv_deplibs_check_method=pass_all
|
||||
;;
|
||||
@@ -4310,6 +4326,8 @@ m4_if([$1], [CXX], [
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
|
||||
fi
|
||||
;;
|
||||
+ astral*)
|
||||
+ ;;
|
||||
chorus*)
|
||||
case $cc_basename in
|
||||
cxch68*)
|
||||
@@ -4561,6 +4579,12 @@ m4_if([$1], [CXX], [
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+
|
||||
+ astral*)
|
||||
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
|
||||
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
|
||||
+ ;;
|
||||
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
@@ -5106,6 +5130,11 @@ _LT_EOF
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+
|
||||
+ astral*)
|
||||
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
|
||||
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
|
||||
+ ;;
|
||||
|
||||
beos*)
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
@@ -5570,7 +5599,8 @@ _LT_EOF
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-
|
||||
+ astral*)
|
||||
+ ;;
|
||||
bsdi[[45]]*)
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
|
||||
;;
|
||||
@@ -6630,6 +6660,10 @@ if test yes != "$_lt_caught_CXX_error"; then
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
+
|
||||
+ astral*)
|
||||
+ _LT_TAGVAR(ld_shlibs, $1)=yes
|
||||
+ ;;
|
||||
|
||||
beos*)
|
||||
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
|
||||
diff --git libtool-clean/m4/ltdl.m4 libtool-workdir/m4/ltdl.m4
|
||||
index 772c150..13807b5 100644
|
||||
--- libtool-clean/m4/ltdl.m4
|
||||
+++ libtool-workdir/m4/ltdl.m4
|
||||
@@ -466,6 +466,9 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
+ astral*)
|
||||
+ lt_cv_sys_dlopen_deplibs=yes
|
||||
+ ;;
|
||||
bitrig*)
|
||||
lt_cv_sys_dlopen_deplibs=yes
|
||||
;;
|
||||
@@ -0,0 +1,12 @@
|
||||
diff --git libxcb-clean/configure.ac libxcb-workdir/configure.ac
|
||||
index 4198a50..d583696 100644
|
||||
--- libxcb-clean/configure.ac
|
||||
+++ libxcb-workdir/configure.ac
|
||||
@@ -54,6 +54,7 @@ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.14)
|
||||
NEEDED="xau >= 0.99.2"
|
||||
case $host_os in
|
||||
linux*) ;;
|
||||
+astral*) ;;
|
||||
*) NEEDED="$NEEDED pthread-stubs" ;;
|
||||
esac
|
||||
PKG_CHECK_MODULES(NEEDED, $NEEDED)
|
||||
@@ -0,0 +1,26 @@
|
||||
diff --git xclock-clean/Clock.c xclock-workdir/Clock.c
|
||||
index de6beb6..0e92cb6 100644
|
||||
--- xclock-clean/Clock.c
|
||||
+++ xclock-workdir/Clock.c
|
||||
@@ -1281,6 +1281,8 @@ time_millis(struct tm *tm, struct timeval *tv)
|
||||
static unsigned long
|
||||
time_intervals(unsigned long millis, unsigned long interval)
|
||||
{
|
||||
+ if(!interval)
|
||||
+ return millis;
|
||||
return (millis + interval / 2) / interval;
|
||||
}
|
||||
|
||||
diff --git xclock-clean/configure.ac xclock-workdir/configure.ac
|
||||
index 7d9847b..e15fecd 100644
|
||||
--- xclock-clean/configure.ac
|
||||
+++ xclock-workdir/configure.ac
|
||||
@@ -41,8 +41,6 @@ XORG_DEFAULT_OPTIONS
|
||||
|
||||
AC_CHECK_FUNCS([strlcpy getpid nl_langinfo])
|
||||
|
||||
-AM_ICONV
|
||||
-
|
||||
dnl Required dependencies
|
||||
PKG_CHECK_MODULES(XCLOCK, [xaw7 xmu x11 xproto >= 7.0.17])
|
||||
XCLOCK_LIBS="$XCLOCK_LIBS $LIBICONV"
|
||||
@@ -0,0 +1,13 @@
|
||||
diff --git xorgproto-clean/include/X11/Xos.h xorgproto-workdir/include/X11/Xos.h
|
||||
index 28dfc67..f46490a 100644
|
||||
--- xorgproto-clean/include/X11/Xos.h
|
||||
+++ xorgproto-workdir/include/X11/Xos.h
|
||||
@@ -60,7 +60,7 @@ in this Software without prior written authorization from The Open Group.
|
||||
*/
|
||||
|
||||
# include <string.h>
|
||||
-# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__)
|
||||
+# if defined(__SCO__) || defined(__UNIXWARE__) || defined(__sun) || defined(__CYGWIN__) || defined(_AIX) || defined(__APPLE__) || defined(__astral__)
|
||||
# include <strings.h>
|
||||
# else
|
||||
# ifndef index
|
||||
Reference in New Issue
Block a user