mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 13:50:08 +02:00
174 lines
5.3 KiB
Plaintext
174 lines
5.3 KiB
Plaintext
From 65d0fae2dc1ddae7ddfd9777fb7be1eb3631067d Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
Date: Sun, 19 Apr 2015 13:38:07 +0200
|
|
Subject: buildsystem configuration for Haiku
|
|
|
|
|
|
diff --git a/source/acinclude.m4 b/source/acinclude.m4
|
|
index 5c8fda7..e73ee7a 100644
|
|
--- a/source/acinclude.m4
|
|
+++ b/source/acinclude.m4
|
|
@@ -463,6 +463,9 @@ AC_DEFUN([AC_CHECK_STRICT_COMPILE],
|
|
if test "$GCC" = yes
|
|
then
|
|
case "${host}" in
|
|
+ *-*-haiku*)
|
|
+ CFLAGS="$CFLAGS -std=c9x"
|
|
+ ;;
|
|
*-*-solaris*)
|
|
# Don't use -std=c99 on Solaris because of timezone check fails
|
|
;;
|
|
--
|
|
2.14.2
|
|
|
|
|
|
From ab4897a6025b583c4656361f2a406b5eb73f5b80 Mon Sep 17 00:00:00 2001
|
|
From: Adrien Destugues <pulkomandy@gmail.com>
|
|
Date: Fri, 3 Oct 2014 11:07:01 +0200
|
|
Subject: Don't call tzset and tzname on Haiku
|
|
|
|
While they exist, they are implemented using ICU, and trying to use them
|
|
within ICU results in a deadlock.
|
|
|
|
diff --git a/source/common/putilimp.h b/source/common/putilimp.h
|
|
index eb9b538..6d9ca65 100644
|
|
--- a/source/common/putilimp.h
|
|
+++ b/source/common/putilimp.h
|
|
@@ -101,7 +101,7 @@ typedef size_t uintptr_t;
|
|
#if U_PLATFORM_HAS_WINUWP_API == 0
|
|
# define U_TZSET _tzset
|
|
#endif
|
|
-#elif U_PLATFORM == U_PF_OS400
|
|
+#elif U_PLATFORM == U_PF_OS400 || defined(__HAIKU__)
|
|
/* not defined */
|
|
#else
|
|
# define U_TZSET tzset
|
|
@@ -139,7 +139,7 @@ typedef size_t uintptr_t;
|
|
#if U_PLATFORM_HAS_WINUWP_API == 0
|
|
# define U_TZNAME _tzname
|
|
#endif
|
|
-#elif U_PLATFORM == U_PF_OS400
|
|
+#elif U_PLATFORM == U_PF_OS400 || defined(__HAIKU__)
|
|
/* not defined */
|
|
#else
|
|
# define U_TZNAME tzname
|
|
diff --git a/source/configure.ac b/source/configure.ac
|
|
index a2fdf84..3497a81 100644
|
|
--- a/source/configure.ac
|
|
+++ b/source/configure.ac
|
|
@@ -803,50 +803,12 @@ else
|
|
fi
|
|
AC_SUBST(U_HAVE_POPEN)
|
|
|
|
-AC_CHECK_FUNC(tzset)
|
|
+#AC_CHECK_FUNC(tzset)
|
|
U_HAVE_TZSET=0
|
|
-if test x$ac_cv_func_tzset = xyes
|
|
-then
|
|
- U_TZSET=tzset
|
|
- U_HAVE_TZSET=1
|
|
-else
|
|
- AC_CHECK_FUNC(_tzset)
|
|
- if test x$ac_cv_func__tzset = xyes
|
|
- then
|
|
- U_TZSET=_tzset
|
|
- U_HAVE_TZSET=1
|
|
- else
|
|
- CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_TZSET=0"
|
|
- fi
|
|
-fi
|
|
AC_SUBST(U_HAVE_TZSET)
|
|
AC_SUBST(U_TZSET)
|
|
|
|
U_HAVE_TZNAME=0
|
|
-AC_CACHE_CHECK(for tzname,ac_cv_var_tzname,
|
|
-[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#ifndef _XOPEN_SOURCE
|
|
-#define _XOPEN_SOURCE
|
|
-#endif
|
|
-#include <stdlib.h>
|
|
-#include <time.h>
|
|
-#ifndef tzname /* For SGI. */
|
|
-extern char *tzname[]; /* RS6000 and others reject char **tzname. */
|
|
-#endif]], [atoi(*tzname);])],[ac_cv_var_tzname=yes],[ac_cv_var_tzname=no])])
|
|
-if test $ac_cv_var_tzname = yes; then
|
|
- U_TZNAME=tzname
|
|
- U_HAVE_TZNAME=1
|
|
-else
|
|
- AC_CACHE_CHECK(for _tzname,ac_cv_var__tzname,
|
|
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <stdlib.h>
|
|
- #include <time.h>
|
|
- extern char *_tzname[];]], [atoi(*_tzname);])],[ac_cv_var__tzname=yes],[ac_cv_var__tzname=no])])
|
|
- if test $ac_cv_var__tzname = yes; then
|
|
- U_TZNAME=_tzname
|
|
- U_HAVE_TZNAME=1
|
|
- else
|
|
- CONFIG_CPPFLAGS="${CONFIG_CPPFLAGS} -DU_HAVE_TZNAME=0"
|
|
- fi
|
|
-fi
|
|
AC_SUBST(U_HAVE_TZNAME)
|
|
AC_SUBST(U_TZNAME)
|
|
|
|
--
|
|
2.14.2
|
|
|
|
|
|
From c17150775a84a5816286d804dd7322fd2413e84f Mon Sep 17 00:00:00 2001
|
|
From: Oliver Tappe <zooey@hirschkaefer.de>
|
|
Date: Fri, 14 Nov 2014 23:56:19 +0100
|
|
Subject: Restore missing parts for proper Haiku port.
|
|
|
|
* Actually set the platform to U_HAIKU for Haiku target.
|
|
* Use gcc to build icudt54l_dat.o for Haiku target.
|
|
|
|
diff --git a/source/configure.ac b/source/configure.ac
|
|
index 3497a81..f402219 100644
|
|
--- a/source/configure.ac
|
|
+++ b/source/configure.ac
|
|
@@ -636,7 +636,7 @@ AC_MSG_CHECKING([for genccode assembly])
|
|
# Check to see if genccode can generate simple assembly.
|
|
GENCCODE_ASSEMBLY=
|
|
case "${host}" in
|
|
-*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu)
|
|
+*-linux*|*-kfreebsd*-gnu*|i*86-*-*bsd*|i*86-pc-gnu|*-haiku*)
|
|
if test "$GCC" = yes; then
|
|
# We're using gcc, and the simple -a gcc command line works for genccode
|
|
GENCCODE_ASSEMBLY="-a gcc"
|
|
@@ -1239,6 +1239,7 @@ case "${host}" in
|
|
*-*-nto*) platform=U_QNX ;;
|
|
*-dec-osf*) platform=U_OSF ;;
|
|
*-*-beos) platform=U_BEOS ;;
|
|
+ *-*-haiku*) platform=U_HAIKU ;;
|
|
*-*-irix*) platform=U_IRIX ;;
|
|
*-ncr-*) platform=U_MPRAS ;;
|
|
*) platform=U_UNKNOWN_PLATFORM ;;
|
|
--
|
|
2.14.2
|
|
|
|
|
|
From 50f4c8d8e7fd9c0e08d16163d50a5463afe58cbb Mon Sep 17 00:00:00 2001
|
|
From: Michael Lotz <mmlr@mlotz.ch>
|
|
Date: Sat, 19 Dec 2015 14:44:35 +0000
|
|
Subject: Fix missing dependency of yearistype.sh to tzdata extraction.
|
|
|
|
This caused parallel builds to fail because the script file wasn't yet
|
|
extracted when it was copied. The regression was introduced in r26995
|
|
when the dependency was reused for TDATA which yearistype.sh isn't part
|
|
of.
|
|
|
|
diff --git a/source/tools/tzcode/Makefile.in b/source/tools/tzcode/Makefile.in
|
|
index f8ab02d..1b33375 100644
|
|
--- a/source/tools/tzcode/Makefile.in
|
|
+++ b/source/tools/tzcode/Makefile.in
|
|
@@ -131,7 +131,7 @@ $(ICUZDUMPTARG): $(srcdir)/icuzdump.cpp
|
|
$(LINK.cc) -I$(srcdir) -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(top_srcdir)/tools/toolutil -I$(top_srcdir)/io -pedantic $(srcdir)/icuzdump.cpp $(LIBICUUC) $(LIBICUDT) $(LIBICUI18N) $(LIBICUIO) $(LIBICUTOOLUTIL) -o $@
|
|
|
|
|
|
-$(TDATA): tdatamarker
|
|
+$(TDATA) $(XDATA): tdatamarker
|
|
|
|
tdatamarker: $(TZDATA)
|
|
gunzip -d < $(TZDATA) | tar xf - --exclude=Makefile
|
|
--
|
|
2.14.2
|
|
|