DOC: update few references to the linux* targets and change them to linux-glibc

The INSTALL guide, the Lua doc and the Prometheus exporter's README all
used to reference "linux2628", "linux26" or even "linux". These were all
updated to consistently reflect "linux-glibc" instead. The default options
were updated there as well so that it should build cleanly on most distros.

diff --git a/INSTALL b/INSTALL
index 9df17caf68c4f00cdaaaec2ec929f0af66e1d297..9754b6699e8630a4b959fff4e0573e7e68b22350 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ are a few build examples :
 
   - recent Linux system with all options, make and install :
     $ make clean
-    $ make -j 4 TARGET=linux2628 USE_NS=1 USE_TFO=1 \
+    $ make -j $(nproc) TARGET=linux-glibc \
                 USE_OPENSSL=1 USE_ZLIB=1 USE_LUA=1 USE_PCRE=1 USE_SYSTEMD=1
     $ sudo make install
 
@@ -39,8 +39,8 @@ are a few build examples :
     $ gmake -j 4 TARGET=freebsd USE_OPENSSL=1 USE_ZLIB=1 USE_LUA=1 USE_PCRE=1
 
   - embedded Linux, build using a cross-compiler :
-    $ make -j 4 TARGET=linux2628 USE_NS=1 USE_OPENSSL=1 USE_SLZ=1 USE_PCRE=1 \
-                CC=/opt/cross/gcc730-arm/bin/gcc
+    $ make -j $(nproc) TARGET=linux-glibc USE_OPENSSL=1 USE_SLZ=1 USE_PCRE=1 \
+                CC=/opt/cross/gcc730-arm/bin/gcc ADDLIB=-latomic
 
   - Build with static PCRE on Solaris / UltraSPARC :
     $ make TARGET=solaris CPU=ultrasparc USE_STATIC_PCRE=1
@@ -349,11 +349,7 @@ and section 3 (build environment). It often refers to section 4 (dependencies).
 To build haproxy, you have to choose your target OS amongst the following ones
 and assign it to the TARGET variable :
 
-  - linux22     for Linux 2.2
-  - linux24     for Linux 2.4 and above (default)
-  - linux24e    for Linux 2.4 with support for a working epoll (> 0.21)
-  - linux26     for Linux 2.6 and above
-  - linux2628   for Linux 2.6.28, 3.x, and above (enables splice and tproxy)
+  - linux-glibc for Linux kernel 2.6.28 and above
   - solaris     for Solaris 8 or 10 (others untested)
   - freebsd     for FreeBSD 5 to 12 (others untested)
   - netbsd      for NetBSD
@@ -411,7 +407,7 @@ to the linker. For example, in order to build a 32-bit binary on an x86_64
 Linux system with SSL support without support for compression but when OpenSSL
 requires ZLIB anyway :
 
-    $ make TARGET=linux2628 ARCH=i386 USE_OPENSSL=1 ADDLIB=-lz
+    $ make TARGET=linux-glibc ARCH=i386 USE_OPENSSL=1 ADDLIB=-lz
 
 Recent systems can resolve IPv6 host names using getaddrinfo(). This primitive
 is not present in all libcs and does not work in all of them either. Support in

diff --git a/contrib/prometheus-exporter/README b/contrib/prometheus-exporter/README
index d02c64dfa66ccca55fc426186616eae81f4422fb..1d1ec0ae947f73bb4547aa622b9e37420234ebdc 100644 (file)
--- a/contrib/prometheus-exporter/README
+++ b/contrib/prometheus-exporter/README
@@ -14,7 +14,7 @@ However, PROMEX is not built by default with HAProxy. It is provided as an extra
 component for everyone want to use it. So you need to explicity build HAProxy
 with the PROMEX service, using the Makefile variable "EXTRA_OBJS". For instance:
 
-    > make TARGET=linux2628 EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
+    > make TARGET=linux-glibc EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o"
 
 if HAProxy provides the PROMEX service, the following build option will be
 reported by the command "haproxy -vv":

diff --git a/doc/lua.txt b/doc/lua.txt
index cbc7f3d8c2cb2f4821f06997a6d9c608c480ed47..a0a1d61800b273ee52abe0f5cf62453166e51710 100644 (file)
--- a/doc/lua.txt
+++ b/doc/lua.txt
@@ -597,8 +597,7 @@ embedding the Lua script language:
    cd haproxy-1.6.2
 
  - build HAProxy:
-   make TARGET=linux \
-        USE_DL=1 \
+   make TARGET=linux-glibc \
         USE_LUA=1 \
         LUA_LIB=/opt/lua-5.3.1/lib \
         LUA_INC=/opt/lua-5.3.1/include