10 Sep
2018
10 Sep
'18
9 a.m.
Module: check_mk
Branch: master
Commit: 8cedb8fdd69c191c829f16fd4247b0bc15b0b34e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cedb8fdd69c19…
Author: Sven Panne <sp(a)mathias-kettner.de>
Date: Mon Sep 10 10:57:52 2018 +0200
Fix SLES 15 build.
Change-Id: I19e71e32d875efb9e0c43d37db5afe3affb688b7
---
.../heirloom-pkgtools/patches/0002-scriptvfy.l.dif | 3 ++-
.../heirloom-pkgtools/patches/0008-libfl.dif | 26 +++++++++++-----------
2 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif
b/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif
index 66af731..3747c02 100644
--- a/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif
+++ b/omd/packages/heirloom-pkgtools/patches/0002-scriptvfy.l.dif
@@ -1,7 +1,7 @@
diff -ru heirloom-pkgtools-070227/libinst/scriptvfy.l
heirloom-pkgtools-070227-patched/libinst/scriptvfy.l
--- heirloom-pkgtools-070227/libinst/scriptvfy.l 2007-02-25 19:39:47.000000000 +0100
+++ heirloom-pkgtools-070227-patched/libinst/scriptvfy.l 2008-12-12 19:27:26.000000000
+0100
-@@ -43,9 +43,16 @@
+@@ -43,9 +43,17 @@
%p 3500
%s WHROOT
%{
@@ -15,6 +15,7 @@ diff -ru heirloom-pkgtools-070227/libinst/scriptvfy.l
heirloom-pkgtools-070227-p
+char *yysptr = yysbuf;
+int yylineno;
+#define U(x) x
++int yywrap(void) { return 1; }
#define input() (((yytchar=yysptr>yysbuf?U(*--yysptr):getc(scr_fp))==10?(yylineno++,yytchar):yytchar)==EOF?0:yytchar)
#define unput(p) ungetc(p, scr_fp)
diff --git a/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif
b/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif
index fbf28fb..be67e6d 100644
--- a/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif
+++ b/omd/packages/heirloom-pkgtools/patches/0008-libfl.dif
@@ -6,7 +6,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/installf/Makefile.mk
heirloom-pk
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = installf
OBJ = dofinal.o installf.o main.o removef.o ../../version/version.o
@@ -18,7 +18,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgadd/Makefile.mk
heirloom-pkgt
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgadd
OBJ = check.o main.o presvr4.o quit.o ../../version/version.o
@@ -30,7 +30,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgadm/Makefile.mk
heirloom-pkgt
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgadm
OBJ = addcert.o certs.o listcert.o lock.o main.o pkgadm_contents.o \
@@ -42,7 +42,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgchk/Makefile.mk
heirloom-pkgt
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgchk
OBJ = checkmap.o ckentry.o main.o ../../version/version.o
@@ -54,7 +54,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgcond/Makefile.mk
heirloom-pkg
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgcond
OBJ = main.o ../../version/version.o
@@ -66,7 +66,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkginstall/Makefile.mk
heirloom-
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkginstall
OBJ = backup.o check.o cppath.o dockspace.o getinst.o instvol.o main.o \
@@ -78,7 +78,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgmk/Makefile.mk
heirloom-pkgto
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgmk
OBJ = main.o mkpkgmap.o quit.o splpkgmap.o ../../version/version.o
@@ -90,7 +90,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgname/Makefile.mk
heirloom-pkg
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgname
OBJ = pkgname.o ../../version/version.o
@@ -102,7 +102,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgparam/Makefile.mk
heirloom-pk
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgparam
OBJ = pkgparam.o ../../version/version.o
@@ -114,7 +114,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgremove/Makefile.mk
heirloom-p
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgremove
OBJ = check.o delmap.o main.o predepend.o quit.o special.o wsreg_pkgrm.o
../../version/version.o
@@ -126,7 +126,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgrm/Makefile.mk
heirloom-pkgto
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgrm
OBJ = check.o main.o presvr4.o quit.o ../../version/version.o
@@ -138,7 +138,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgscripts/Makefile.mk
heirloom-
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = cmdexec
OBJ = cmdexec.o ../../version/version.o
@@ -150,7 +150,7 @@ diff -Nur heirloom-pkgtools-070227.orig/pkgcmds/pkgtrans/Makefile.mk
heirloom-pk
PKGLIBS = -L../../libinst -linst -L../../libpkg -lpkg -L../../libgendb -lgendb \
-L../../libadm -ladm -L../../libpkgdb -lpkgdb \
- -L$(CCSDIR)/lib -ll
-+ -L$(CCSDIR)/lib -lfl
++ -L$(CCSDIR)/lib
BIN = pkgtrans
OBJ = main.o ../../version/version.o