* [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-gfx/files/, media-libs/sdl2-gfx/
@ 2021-01-21 17:19 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2021-01-21 17:19 UTC (permalink / raw
To: gentoo-commits
commit: e4de27b039a858253a3d6b86b22965ab746514b2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 17:19:15 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jan 21 17:19:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4de27b0
media-libs/sdl2-gfx: Fixed build with sys-devel/slibtool
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch | 29 ++++++++++++++++++++++
media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild | 6 ++++-
2 files changed, 34 insertions(+), 1 deletion(-)
diff --git a/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
new file mode 100644
index 00000000000..3fd3b8767fe
--- /dev/null
+++ b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
@@ -0,0 +1,29 @@
+This fixes build with sys-devel/slibtool
+
+--- SDL2_gfx-1.0.4/configure.in
++++ SDL2_gfx-1.0.4/configure.in
+@@ -58,6 +58,9 @@
+ fi
+ AC_CHECK_PROGS(WINDRES, [windres $hostaliaswindres $host_os-windres])
+
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ case "$host" in
+ *-*-beos*)
+ ac_default_prefix=/boot/develop/tools/gnupro
+--- SDL2_gfx-1.0.4/Makefile.am
++++ SDL2_gfx-1.0.4/Makefile.am
+@@ -21,9 +21,11 @@
+
+ libSDL2_gfx_la_LDFLAGS = \
+ -no-undefined \
+- -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
++libSDL2_gfx_la_LIBADD = \
++ $(LIBM)
++
+ %.o : %.rc
+ $(WINDRES) $< $@
+
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
index 860562eafdb..494a39f77f5 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,6 +21,10 @@ DOCS=( AUTHORS ChangeLog README )
S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.4-slibtool.patch"
+)
+
src_prepare() {
default
mv configure.in configure.ac || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-gfx/files/, media-libs/sdl2-gfx/
@ 2021-01-23 21:38 Lars Wendler
0 siblings, 0 replies; 2+ messages in thread
From: Lars Wendler @ 2021-01-23 21:38 UTC (permalink / raw
To: gentoo-commits
commit: d879514d47aecf06486cb36be7ff84b81f04bca2
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 21:34:28 2021 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 21:38:54 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d879514d
media-libs/sdl2-gfx: Fixed build with sys-devel/slibtool
this time without breaking .so libnames
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
.../sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch | 26 ++++++++++++++++++++++
media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild | 6 ++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
new file mode 100644
index 00000000000..e4895c30951
--- /dev/null
+++ b/media-libs/sdl2-gfx/files/sdl2-gfx-1.0.4-slibtool.patch
@@ -0,0 +1,26 @@
+This fixes build with sys-devel/slibtool
+
+--- SDL2_gfx-1.0.4/configure.in
++++ SDL2_gfx-1.0.4/configure.in
+@@ -58,6 +58,9 @@
+ fi
+ AC_CHECK_PROGS(WINDRES, [windres $hostaliaswindres $host_os-windres])
+
++AC_CHECK_LIBM
++AC_SUBST([LIBM])
++
+ case "$host" in
+ *-*-beos*)
+ ac_default_prefix=/boot/develop/tools/gnupro
+--- SDL2_gfx-1.0.4/Makefile.am
++++ SDL2_gfx-1.0.4/Makefile.am
+@@ -24,6 +24,9 @@
+ -release $(LT_RELEASE) \
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+
++libSDL2_gfx_la_LIBADD = \
++ $(LIBM)
++
+ %.o : %.rc
+ $(WINDRES) $< $@
+
diff --git a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
index 860562eafdb..494a39f77f5 100644
--- a/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
+++ b/media-libs/sdl2-gfx/sdl2-gfx-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -21,6 +21,10 @@ DOCS=( AUTHORS ChangeLog README )
S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.4-slibtool.patch"
+)
+
src_prepare() {
default
mv configure.in configure.ac || die
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-01-23 21:38 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-23 21:38 [gentoo-commits] repo/gentoo:master commit in: media-libs/sdl2-gfx/files/, media-libs/sdl2-gfx/ Lars Wendler
-- strict thread matches above, loose matches on Subject: below --
2021-01-21 17:19 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox