[packages/libsmbios] - rediff patches

baggins baggins at pld-linux.org
Fri Mar 5 22:53:12 CET 2021


commit 4c5e6a3c9a258dfeff3595af4df76c66b3a9f151
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Mar 5 22:52:59 2021 +0100

    - rediff patches

 libsmbios-link.patch |  9 +++++----
 libsmbios-sh.patch   | 24 +++++++++++++-----------
 2 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/libsmbios-link.patch b/libsmbios-link.patch
index 7582d5e..10652a6 100644
--- a/libsmbios-link.patch
+++ b/libsmbios-link.patch
@@ -1,7 +1,8 @@
---- libsmbios-2.2.27/Makefile.am.orig	2011-04-29 20:54:29.000000000 +0200
-+++ libsmbios-2.2.27/Makefile.am	2011-04-30 21:09:39.558966153 +0200
-@@ -22,7 +22,7 @@
- AM_CXXFLAGS = -Wall
+diff -urNp -x '*.orig' libsmbios-2.4.3.org/Makefile.am libsmbios-2.4.3/Makefile.am
+--- libsmbios-2.4.3.org/Makefile.am	2020-02-01 02:40:02.000000000 +0100
++++ libsmbios-2.4.3/Makefile.am	2021-03-05 22:52:24.349063323 +0100
+@@ -23,7 +23,7 @@ AM_CFLAGS = -Wall -Wextra -Wno-missing-f
+ AM_CXXFLAGS = -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -fPIC
  AM_LDADD = $(LIBINTL)
  
 -AM_LDFLAGS = -L$(top_builddir)/out/
diff --git a/libsmbios-sh.patch b/libsmbios-sh.patch
index 0392726..30bd8ac 100644
--- a/libsmbios-sh.patch
+++ b/libsmbios-sh.patch
@@ -1,14 +1,6 @@
---- libsmbios-2.2.26/src/python/Makefile.am.orig	2010-06-24 21:48:29.000000000 +0200
-+++ libsmbios-2.2.26/src/python/Makefile.am	2010-08-14 16:23:59.846823295 +0200
-@@ -32,5 +32,5 @@
- 	cp $< $@
- 	for var in $(REPLACE_VARS)	;\
- 	do	\
--		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|"  $@;\
-+		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$$(eval echo \$$$$var)\"|"  $@;\
- 	done
---- libsmbios-2.4.1/Makefile-std.orig	2018-02-14 20:28:09.000000000 +0100
-+++ libsmbios-2.4.1/Makefile-std	2018-04-21 21:17:29.186674425 +0200
+diff -urNp -x '*.orig' libsmbios-2.4.3.org/Makefile-std libsmbios-2.4.3/Makefile-std
+--- libsmbios-2.4.3.org/Makefile-std	2020-02-01 02:40:02.000000000 +0100
++++ libsmbios-2.4.3/Makefile-std	2021-03-05 22:52:24.235730489 +0100
 @@ -38,7 +38,7 @@ install-data-hook:
  	    file=$(DESTDIR)/$$i                     ;\
  	    for var in $(REPLACE_VARS)	;\
@@ -27,3 +19,13 @@
  	    done	;\
  	done
  
+diff -urNp -x '*.orig' libsmbios-2.4.3.org/src/python/Makefile.am libsmbios-2.4.3/src/python/Makefile.am
+--- libsmbios-2.4.3.org/src/python/Makefile.am	2020-02-01 02:40:02.000000000 +0100
++++ libsmbios-2.4.3/src/python/Makefile.am	2021-03-05 22:52:24.235730489 +0100
+@@ -29,5 +29,5 @@ src/python/_vars.py: src/python/libsmbio
+ 	cp $< $@
+ 	for var in $(REPLACE_VARS)	;\
+ 	do	\
+-		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$${!var}\"|"  $@;\
++		perl -p -i -e "s|^$$var\s*=.*|$$var=\"$$(eval echo \$$$$var)\"|"  $@;\
+ 	done
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsmbios.git/commitdiff/4c5e6a3c9a258dfeff3595af4df76c66b3a9f151



More information about the pld-cvs-commit mailing list