84 lines
2.3 KiB
Plaintext
84 lines
2.3 KiB
Plaintext
From eba61b839d441f8c69e05fe22c0f530f8118a670 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 19 Oct 2015 23:01:16 +0000
|
|
Subject: [BUILD] add Haiku as supported target.
|
|
|
|
* also replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index 4f0aa8a..e154521 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -98,7 +98,7 @@ DOCDIR = $(PREFIX)/doc/haproxy
|
|
# Use TARGET=<target_name> to optimize for a specifc target OS among the
|
|
# following list (use the default "generic" if uncertain) :
|
|
# generic, linux22, linux24, linux24e, linux26, solaris,
|
|
-# freebsd, openbsd, netbsd, cygwin, custom, aix51, aix52
|
|
+# freebsd, openbsd, netbsd, cygwin, haiku, custom, aix51, aix52
|
|
TARGET =
|
|
|
|
#### TARGET CPU
|
|
@@ -220,6 +220,12 @@ ifeq ($(TARGET),generic)
|
|
USE_POLL = implicit
|
|
USE_TPROXY = implicit
|
|
else
|
|
+ifeq ($(TARGET),haiku)
|
|
+ # For Haiku
|
|
+ TARGET_LDFLAGS = -lnetwork
|
|
+ USE_POLL = implicit
|
|
+ USE_TPROXY = implicit
|
|
+else
|
|
ifeq ($(TARGET),linux22)
|
|
# This is for Linux 2.2
|
|
USE_GETSOCKNAME = implicit
|
|
@@ -347,6 +353,7 @@ endif # linux26
|
|
endif # linux24e
|
|
endif # linux24
|
|
endif # linux22
|
|
+endif # haiku
|
|
endif # generic
|
|
|
|
|
|
diff --git a/README b/README
|
|
index cf97605..72144d9 100644
|
|
--- a/README
|
|
+++ b/README
|
|
@@ -47,6 +47,7 @@ and assign it to the TARGET variable :
|
|
- aix51 for AIX 5.1
|
|
- aix52 for AIX 5.2
|
|
- cygwin for Cygwin
|
|
+ - haiku for Haiku
|
|
- generic for any other OS or version.
|
|
- custom to manually adjust every setting
|
|
|
|
--
|
|
2.2.2
|
|
|
|
|
|
From f367d3b4b88f46cae1b6a5c25342d7077f225baf Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Mon, 2 Nov 2015 17:47:43 +0000
|
|
Subject: [BUILD] replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index e154521..3af735e 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -812,10 +812,9 @@ install-doc:
|
|
install -m 644 doc/$$x.txt "$(DESTDIR)$(DOCDIR)" ; \
|
|
done
|
|
|
|
-install-bin: haproxy haproxy-systemd-wrapper
|
|
+install-bin: haproxy $(EXTRA)
|
|
install -d "$(DESTDIR)$(SBINDIR)"
|
|
- install haproxy "$(DESTDIR)$(SBINDIR)"
|
|
- install haproxy-systemd-wrapper "$(DESTDIR)$(SBINDIR)"
|
|
+ install haproxy $(EXTRA) "$(DESTDIR)$(SBINDIR)"
|
|
|
|
install: install-bin install-man install-doc
|
|
|
|
--
|
|
2.2.2
|
|
|