summaryrefslogtreecommitdiffstats
path: root/recipes-support/lin-config/files
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-support/lin-config/files')
-rw-r--r--recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch33
-rw-r--r--recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch20
2 files changed, 0 insertions, 53 deletions
diff --git a/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch b/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch
deleted file mode 100644
index fe08b7d81..000000000
--- a/recipes-support/lin-config/files/0001-Change-Makefile-to-use-pkg-config-for-libxml-2.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 59acd73ba3bd6cc4151b890d135c6d690a83374d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan-Simon=20M=C3=B6ller?= <jsmoeller@linuxfoundation.org>
-Date: Tue, 1 Oct 2019 15:24:07 +0000
-Subject: [PATCH] Change Makefile to use pkg-config for libxml-2.0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-instead of xml2-config.
-
-Upstream-Status: Pending
-
-Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
----
- lin_config/src/Makefile | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index cf5c515..3fc4df1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,5 @@
--CC=gcc
--CFLAGS=-std=gnu99 -Wall -pedantic $(DEBUG) `xml2-config --cflags` `pkg-config --cflags libnl-route-3.0` -I$(INCLUDE)
--LIBS=`xml2-config --libs` `pkg-config --libs libnl-route-3.0`
-+CFLAGS=-std=gnu99 -Wall -pedantic $(DEBUG) `pkg-config --cflags libxml-2.0` `pkg-config --cflags libnl-route-3.0` -I$(INCLUDE)
-+LIBS=`pkg-config --libs libxml-2.0` `pkg-config --libs libnl-route-3.0`
- INCLUDE=../../sllin
- DEBUG=-ggdb
-
---
-2.16.4
-
diff --git a/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch b/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch
deleted file mode 100644
index 26364455a..000000000
--- a/recipes-support/lin-config/files/0002-Change-Makefile-to-use-LDFLAGS.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Use LDFLAGS when linking
-
-Use LDFLAGS when linking the output binary to quiet QA warnings due to
-missing link flags.
-
-Upstream-Status: Pending
-
-Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-
---- a/Makefile 2019-11-05 11:08:11.060565285 +0000
-+++ b/Makefile 2019-11-05 11:09:38.663570084 +0000
-@@ -6,7 +6,7 @@
- objects = linc_parse_xml.o pcl_config.o sllin_config.o lin_config.o
-
- lin_config: $(objects)
-- $(CC) $(objects) $(LIBS) -o lin_config
-+ $(CC) $(LDFLAGS) $(objects) $(LIBS) -o lin_config
-
- %.o : %.c %.h
- $(CC) $(CFLAGS) $(LIBS) -c $< -o $@