mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-08 21:00:05 +02:00
haproxy: bump version
This commit is contained in:
@@ -1,47 +0,0 @@
|
||||
SUMMARY="Reliable, high performace TCP/HTTP load balancer"
|
||||
DESCRIPTION="
|
||||
HAProxy is a free, very fast and reliable solution offering high availability, \
|
||||
load balancing, and proxying for TCP and HTTP-based applications. It is \
|
||||
particularly suited for web sites crawling under very high loads while needing \
|
||||
persistence or Layer7 processing."
|
||||
HOMEPAGE="http://www.haproxy.org/"
|
||||
COPYRIGHT="2012 Willy Tarreau"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="git://github.com/haproxy/haproxy.git"
|
||||
PATCHES="haproxy-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="?all"
|
||||
|
||||
PROVIDES="
|
||||
haproxy = $portVersion
|
||||
cmd:haproxy = $portVersion
|
||||
"
|
||||
REQUIRES="
|
||||
haiku
|
||||
"
|
||||
|
||||
BUILD_PREREQUIRES="
|
||||
haiku_devel
|
||||
cmd:gcc
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
make TARGET=haiku PREFIX="$prefix"
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
mkdir -p "${sbinDir}"
|
||||
mkdir -p "${manDir}"
|
||||
mkdir -p "${docDir}"
|
||||
|
||||
|
||||
make install DESTDIR="" \
|
||||
PREFIX="$prefix"\
|
||||
SBINDIR="${sbinDir}" \
|
||||
MANDIR="${manDir}" \
|
||||
DOCDIR="${docDir}"
|
||||
}
|
||||
@@ -7,10 +7,9 @@ persistence or Layer7 processing."
|
||||
HOMEPAGE="http://www.haproxy.org/"
|
||||
COPYRIGHT="2012 Willy Tarreau"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
SOURCE_URI="http://www.haproxy.org/download/1.6/src/haproxy-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="583e0c0c3388c0597dea241601f3fedfe1d7ff8c735d471831be67315f58183a"
|
||||
PATCHES="haproxy-$portVersion.patchset"
|
||||
REVISION="1"
|
||||
SOURCE_URI="http://www.haproxy.org/download/2.5/src/haproxy-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="d6fa3c66f707ff93b5bd27ce69e70a8964d7b7078548b51868d47d7df3943fe4"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2"
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
From 8964d6b3c98a96ac0bf11983d4513201a2a2b5eb Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Mon, 19 Oct 2015 23:01:16 +0000
|
||||
Subject: add Haiku as supported target.
|
||||
|
||||
* also replace haproxy-systemd-wrapper with $(EXTRA) in install-bin.
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index d15be04..d42d5fb 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 6d341d3..5bc5f04 100644
|
||||
--- a/README
|
||||
+++ b/README
|
||||
@@ -48,6 +48,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
|
||||
|
||||
@@ -1,83 +0,0 @@
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user