mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
89 lines
3.6 KiB
Plaintext
89 lines
3.6 KiB
Plaintext
From 502b3d46c2b0edf22c4d47d1384f3f740ed7e7c9 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Fri, 1 Jun 2018 15:23:47 +0300
|
|
Subject: Fix make distro-pack-install on Haiku
|
|
|
|
|
|
diff --git a/Repository.mk b/Repository.mk
|
|
index 9936b0e..4193e55 100644
|
|
--- a/Repository.mk
|
|
+++ b/Repository.mk
|
|
@@ -142,7 +142,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
|
|
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
|
|
$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
|
|
$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
|
|
- $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \
|
|
+ $(if $(filter-out ANDROID HAIKU IOS MACOSX WNT,$(OS)),oosplash) \
|
|
soffice_bin \
|
|
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
|
|
$(if $(filter WNT,$(OS)), \
|
|
@@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,pdfimport, \
|
|
endif
|
|
|
|
$(eval $(call gb_Helper_register_executables_for_install,UREBIN,ure,\
|
|
- $(if $(and $(ENABLE_JAVA),$(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
|
|
+ $(if $(and $(ENABLE_JAVA),$(filter-out HAIKU MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),javaldx) \
|
|
$(if $(ENABLE_MACOSX_SANDBOX),, \
|
|
regmerge \
|
|
regview \
|
|
@@ -1017,7 +1017,7 @@ $(eval $(call gb_Helper_register_packages_for_install,brand,\
|
|
desktop_branding \
|
|
$(if $(CUSTOM_BRAND_DIR),desktop_branding_custom) \
|
|
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
|
|
- $(if $(and $(filter-out MACOSX WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
|
|
+ $(if $(and $(filter-out MACOSX HAIKU WNT,$(OS)),$(filter DESKTOP,$(BUILD_TYPE))),\
|
|
$(if $(ENABLE_HEADLESS),, \
|
|
desktop_soffice_sh \
|
|
) \
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From bcab46b0dee58ee4e501aa46204a392afcd4e854 Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Mon, 4 Jun 2018 11:55:30 +0300
|
|
Subject: Fix profile dir location on Haiku
|
|
|
|
|
|
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
|
|
index ebeb00d..da4f697 100644
|
|
--- a/instsetoo_native/CustomTarget_setup.mk
|
|
+++ b/instsetoo_native/CustomTarget_setup.mk
|
|
@@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
|
|
&& echo 'InstallMode=<installmode>' \
|
|
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
|
|
$(if $(ENABLE_RELEASE_BUILD),\
|
|
- && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
|
|
+ && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \
|
|
&& echo 'UserInstallation=$$ORIGIN/..') \
|
|
) > $@
|
|
|
|
--
|
|
2.16.4
|
|
|
|
|
|
From d3973ea8b2cdadfe9a748d424835de9fde8f5140 Mon Sep 17 00:00:00 2001
|
|
From: Kacper Kasper <kacperkasper@gmail.com>
|
|
Date: Mon, 30 Jul 2018 22:38:23 +0000
|
|
Subject: Fix stack protector check
|
|
|
|
* "return 0;" is not enough to trigger it.
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 9b31d89..e19cd6c 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -5916,7 +5916,8 @@ if test "$GCC" = "yes" -o "$COM_IS_CLANG" = TRUE; then
|
|
AC_MSG_CHECKING([whether $CC supports -fstack-protector-strong])
|
|
save_CFLAGS=$CFLAGS
|
|
CFLAGS="$CFLAGS -Werror -fstack-protector-strong"
|
|
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ return 0; ]])],[ HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
|
|
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[ char a[8]; return 0; ]])],[
|
|
+HAVE_GCC_STACK_PROTECTOR_STRONG=TRUE ],[])
|
|
CFLAGS=$save_CFLAGS
|
|
if test "$HAVE_GCC_STACK_PROTECTOR_STRONG" = "TRUE"; then
|
|
AC_MSG_RESULT([yes])
|
|
--
|
|
2.16.4
|
|
|