mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-19 18:20:07 +02:00
105 lines
3.9 KiB
Plaintext
105 lines
3.9 KiB
Plaintext
From d61281df40170267a5f6cadf6b0c83afa4192515 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Fri, 23 Aug 2024 18:42:43 +0200
|
|
Subject: disable PIE, remove BRANCH_VERSION
|
|
|
|
* PIE is unsupported on Haiku, but not detected correctly.
|
|
* the BRANCH_VERSION detection is faulty because it checks whether
|
|
a .git directory exists, which is the case in haikuporter.
|
|
We build from a tarball, so remove that code entirely.
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 795ff47..664466f 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -45,7 +45,6 @@ dnl until flex gets their act together, use pedantic instead of pedantic-errors
|
|
AX_CHECK_COMPILE_FLAG([-pedantic], [CFLAGS+=" -pedantic"])
|
|
dnl AX_CHECK_COMPILE_FLAG([-pedantic-errors], [CFLAGS+=" -pedantic-errors"])
|
|
AX_CHECK_COMPILE_FLAG([-fstack-protector-strong], [CFLAGS+=" -fstack-protector-strong"])
|
|
-AX_CHECK_COMPILE_FLAG([-fPIE], [CFLAGS+=" -fPIE"])
|
|
AX_CHECK_COMPILE_FLAG([-Wformat=2], [CFLAGS+=" -Wformat=2"])
|
|
AX_CHECK_COMPILE_FLAG([-Werror=format-security], [CFLAGS+=" -Werror=format-security"])
|
|
AX_CHECK_COMPILE_FLAG([-Wstrict-prototypes], [CFLAGS+=" -Wstrict-prototypes"])
|
|
@@ -55,8 +54,6 @@ AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS+=" -Wextra"])
|
|
AX_CHECK_COMPILE_FLAG([-Wno-gnu-statement-expression], [CFLAGS+=" -Wno-gnu-statement-expression"])
|
|
AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS+=" -Wl,-z,relro"])
|
|
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS+=" -Wl,-z,now"])
|
|
-AX_CHECK_LINK_FLAG([-fPIE], [LDFLAGS+=" -fPIE"])
|
|
-AX_CHECK_LINK_FLAG([-pie], [LDFLAGS+=" -pie"])
|
|
|
|
gl_FUNC_REALPATH_WORKS
|
|
|
|
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
index b5c1c2e..d9ffe27 100644
|
|
--- a/src/Makefile.am
|
|
+++ b/src/Makefile.am
|
|
@@ -27,25 +27,6 @@ gregorio__GREGORIO_EXE_SUFFIX__SOURCES = \
|
|
gregoriotex/gregoriotex-write.c gregoriotex/gregoriotex-position.c \
|
|
gregoriotex/gregoriotex.h
|
|
|
|
-@MK@ifneq ($(wildcard ../.git),)
|
|
-@MK@ _tag_ = $(shell git describe --exact-match HEAD 2>/dev/null)
|
|
-@MK@ ifeq ($(_tag_),)
|
|
-@MK@ DEFS += -DBRANCH_VERSION='"$(shell git rev-parse --abbrev-ref HEAD)-$(shell git rev-parse --short HEAD)-$(shell git rev-list HEAD --count)"'
|
|
-@MK@ endif
|
|
-@MK@else
|
|
-@MK@ ifneq ($(wildcard ../.hg/git),)
|
|
-@MK@ _gitnode_ = $(shell hg log --template='{gitnode}' -r .)
|
|
-@MK@ ifeq ($(_gitnode_),)
|
|
-@MK@ DEFS += -DBRANCH_VERSION='"$(shell hg log --template='{activebookmark}-hg:{manifest}' -r .)"'
|
|
-@MK@ else
|
|
-@MK@ _tag_ = $(shell git --git-dir=../.hg/git describe --exact-match '$(_gitnode_)' 2>/dev/null)
|
|
-@MK@ ifeq ($(_tag_),)
|
|
-@MK@ DEFS += -DBRANCH_VERSION='"$(shell hg log --template='{activebookmark}' -r .)-$(shell git --git-dir=../.hg/git rev-parse --short '$(_gitnode_)')-$(shell git --git-dir=../.hg/git rev-list '$(_gitnode_)' --count)"'
|
|
-@MK@ endif
|
|
-@MK@ endif
|
|
-@MK@ endif
|
|
-@MK@endif
|
|
-
|
|
# gabc files
|
|
gregorio__GREGORIO_EXE_SUFFIX__SOURCES += \
|
|
gabc/gabc-elements-determination.c gabc/gabc-write.c \
|
|
--
|
|
2.48.1
|
|
|
|
|
|
From d60f684cbec3e2cc39539598d8f4cf51e78ebebe Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Sun, 16 Mar 2025 14:09:47 +0100
|
|
Subject: add Haiku build support
|
|
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
index 664466f..9bc80a5 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -117,6 +117,7 @@ AC_CANONICAL_HOST
|
|
build_linux=no
|
|
build_windows=no
|
|
build_mac=no
|
|
+build_haiku=no
|
|
|
|
# Detect the target system
|
|
case "${host_os}" in
|
|
@@ -129,6 +130,9 @@ case "${host_os}" in
|
|
darwin*)
|
|
build_mac=yes
|
|
;;
|
|
+ haiku*)
|
|
+ build_haiku=yes
|
|
+ ;;
|
|
*)
|
|
AC_MSG_ERROR(["OS $host_os is not supported"])
|
|
;;
|
|
@@ -138,6 +142,7 @@ esac
|
|
AM_CONDITIONAL([LINUX], [test "$build_linux" = "yes"])
|
|
AM_CONDITIONAL([WINDOWS], [test "$build_windows" = "yes"])
|
|
AM_CONDITIONAL([MACOSX], [test "$build_mac" = "yes"])
|
|
+AM_CONDITIONAL([HAIKU], [test "$build_haiku" = "yes"])
|
|
|
|
AC_CONFIG_HEADERS([src/config_.h])
|
|
AC_CONFIG_FILES([
|
|
--
|
|
2.48.1
|
|
|