From: kawaiiamber <kawaiiamber@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] xbps: Remove reduntant patch
Date: Fri, 12 Mar 2021 23:58:36 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29424@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
There is a new pull request by kawaiiamber against master on the void-packages repository
https://github.com/kawaiiamber/void-packages xbps
https://github.com/void-linux/void-packages/pull/29424
xbps: Remove reduntant patch
This patch no longer does anything as $(CFLAGS) is now included in the libxbps.so rule in the Makefile in lib/Makefile as seen [here](https://github.com/void-linux/xbps/blob/master/lib/Makefile).
A patch file from https://github.com/void-linux/void-packages/pull/29424.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xbps-29424.patch --]
[-- Type: text/x-diff, Size: 1203 bytes --]
From de8a4ae43a5ee94a30d3c9d377fe267baf7ddc24 Mon Sep 17 00:00:00 2001
From: KawaiiAmber <japaneselearning101@gmail.com>
Date: Fri, 12 Mar 2021 15:55:11 -0700
Subject: [PATCH] xbps: Remove reduntant patch
---
srcpkgs/xbps/patches/cflags.patch | 17 -----------------
1 file changed, 17 deletions(-)
delete mode 100644 srcpkgs/xbps/patches/cflags.patch
diff --git a/srcpkgs/xbps/patches/cflags.patch b/srcpkgs/xbps/patches/cflags.patch
deleted file mode 100644
index 8e576f2a887..00000000000
--- a/srcpkgs/xbps/patches/cflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Both CFLAGS and LDFLAGS need to be passed during linkage as CFLAGS may contain
-things that influence linkage (e.g. ssp_nonshared may be necessary to link
-when using strong stack protector)
-
-diff --git lib/Makefile lib/Makefile
-index 65342ef..847bfdd 100644
---- lib/Makefile
-+++ lib/Makefile
-@@ -78,7 +78,7 @@ $(OBJS): %.o: %.c
-
- libxbps.so: $(LIBFETCH_OBJS) $(LIBPROP_OBJS) $(OBJS)
- @printf " [CCLD]\t\t$@\n"
-- ${SILENT}$(CC) $^ $(LDFLAGS) -o $(LIBXBPS_SHLIB)
-+ ${SILENT}$(CC) $^ $(CFLAGS) $(LDFLAGS) -o $(LIBXBPS_SHLIB)
- @-ln -sf $(LIBXBPS_SHLIB) libxbps.so.$(LIBXBPS_MAJOR)
- @-ln -sf $(LIBXBPS_SHLIB) libxbps.so
-
next reply other threads:[~2021-03-12 22:58 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-12 22:58 kawaiiamber [this message]
2021-03-12 23:08 ` Chocimier
2021-03-12 23:08 ` [PR PATCH] [Closed]: " Chocimier
2021-03-12 23:11 ` kawaiiamber
2021-03-12 23:15 ` kawaiiamber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-29424@inbox.vuxu.org \
--to=kawaiiamber@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).