Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (93709608732f3f0ab9dbbf2cf3dbbe0cf73ae8e7)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (93709608732f3f0ab9dbbf2cf3dbbe0cf73ae8e7)
  • Date: Sat, 23 Jul 2022 17:05:01 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

utils/dcron/HISTORY |
4 +
utils/dcron/PRE_BUILD |
3
utils/dcron/patches/0001-drop-LDFLAGS-set-and-restore-CFLAGS-linking.patch |
38 ++++++++++
3 files changed, 43 insertions(+), 2 deletions(-)

New commits:
commit 93709608732f3f0ab9dbbf2cf3dbbe0cf73ae8e7
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

dcron: Fix CFLAGS & LDFLAGS with patch

Remove the sed line.

Fixes linking when flags affect both stages.

diff --git a/utils/dcron/HISTORY b/utils/dcron/HISTORY
index 26f4a2e..6e41649 100644
--- a/utils/dcron/HISTORY
+++ b/utils/dcron/HISTORY
@@ -1,3 +1,7 @@
+2022-07-22 Ismael Luceno <ismael AT iodev.co.uk>
+ * patches/0001-drop-LDFLAGS-set-and-restore-CFLAGS-linking.patch,
+ PRE_BUILD: fixed LDFLAGS/CFLAGS with patch
+
2011-05-02 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 4.5

diff --git a/utils/dcron/PRE_BUILD b/utils/dcron/PRE_BUILD
index e2651af..c230ad1 100755
--- a/utils/dcron/PRE_BUILD
+++ b/utils/dcron/PRE_BUILD
@@ -1,4 +1,3 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
-
-sed -i "s:-O2:$CFLAGS:" Makefile
+apply_patch_dir patches
diff --git
a/utils/dcron/patches/0001-drop-LDFLAGS-set-and-restore-CFLAGS-linking.patch
b/utils/dcron/patches/0001-drop-LDFLAGS-set-and-restore-CFLAGS-linking.patch
new file mode 100644
index 0000000..7fa2d8d
--- /dev/null
+++
b/utils/dcron/patches/0001-drop-LDFLAGS-set-and-restore-CFLAGS-linking.patch
@@ -0,0 +1,38 @@
+From 8a292168e584c50808b80df3577a7d89fa32db26 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier AT gentoo.org>
+Date: Mon, 16 May 2011 16:24:20 -0400
+Subject: [PATCH] drop LDFLAGS set, and restore CFLAGS linking
+
+Signed-off-by: Mike Frysinger <vapier AT gentoo.org>
+---
+ Makefile | 5 ++---
+ 1 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1938e05..8309ad6 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,7 +32,6 @@ TABSRCS = crontab.c chuser.c
+ TABOBJS = crontab.o chuser.o
+ PROTOS = protos.h
+ LIBS =
+-LDFLAGS =
+ DEFS = -DVERSION='"$(VERSION)"' \
+ -DSCRONTABS='"$(SCRONTABS)"' -DCRONTABS='"$(CRONTABS)"' \
+ -DCRONSTAMPS='"$(CRONSTAMPS)"' -DLOG_IDENT='"$(LOG_IDENT)"' \
+@@ -54,10 +53,10 @@ protos.h: $(SRCS) $(TABSRCS)
+ fgrep -h Prototype $(SRCS) $(TABSRCS) > protos.h
+
+ crond: $(OBJS)
+- $(CC) $(LDFLAGS) $^ $(LIBS) -o crond
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ $(LIBS) -o crond
+
+ crontab: $(TABOBJS)
+- $(CC) $(LDFLAGS) $^ -o crontab
++ $(CC) $(CFLAGS) $(LDFLAGS) $^ -o crontab
+
+ %.o: %.c defs.h $(PROTOS)
+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $(DEFS) $< -o $@
+--
+1.7.5.rc3
+



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (93709608732f3f0ab9dbbf2cf3dbbe0cf73ae8e7), Ismael Luceno, 07/23/2022

Archive powered by MHonArc 2.6.24.

Top of Page