commit: 4772891540f5809a3318c8bee143729a1c80b2a5 Author: Quincy Fleming <quincyf467 <AT> protonmail <DOT> com> AuthorDate: Tue Apr 9 22:30:30 2024 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Tue Apr 9 22:30:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47728915
dev-embedded/qdl: update HOMEPAGE Signed-off-by: Quincy Fleming <quincyf467 <AT> protonmail.com> dev-embedded/qdl/files/makefile.patch | 17 ----------------- dev-embedded/qdl/qdl-2024.4.9.ebuild | 14 +++++++------- dev-embedded/qdl/qdl-9999.ebuild | 13 +++++++------ 3 files changed, 14 insertions(+), 30 deletions(-) diff --git a/dev-embedded/qdl/files/makefile.patch b/dev-embedded/qdl/files/makefile.patch deleted file mode 100644 index a24de2b5c3..0000000000 --- a/dev-embedded/qdl/files/makefile.patch +++ /dev/null @@ -1,17 +0,0 @@ -#Created by Quincy Fleming -#CFLAGS and LDFLAGS were not being respected -#Bug links: https://bugs.gentoo.org/910480 https://bugs.gentoo.org/910481 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,8 @@ - OUT := qdl - --CFLAGS := -O2 -Wall -g `pkg-config --cflags libxml-2.0` --LDFLAGS := `pkg-config --libs libxml-2.0 libudev` --prefix := /usr/local -+CFLAGS += `${PKG_CONFIG} --cflags libxml-2.0` -+LDFLAGS += `${PKG_CONFIG} --libs libxml-2.0 libudev` -+prefix = ${EPREFIX}/usr - - SRCS := firehose.c qdl.c sahara.c util.c patch.c program.c ufs.c - OBJS := $(SRCS:.c=.o) diff --git a/dev-embedded/qdl/qdl-2024.4.9.ebuild b/dev-embedded/qdl/qdl-2024.4.9.ebuild index dcba98c9b0..604b7390c4 100644 --- a/dev-embedded/qdl/qdl-2024.4.9.ebuild +++ b/dev-embedded/qdl/qdl-2024.4.9.ebuild @@ -7,7 +7,7 @@ inherit toolchain-funcs DESCRIPTION="Tool to communicate with Qualcomm System On a Chip bootroms" COMMIT_ID="a629f43428ebd17080f55543f893d45694234f75" -HOMEPAGE="https://github.com/andersson/qdl"; +HOMEPAGE="https://github.com/linux-msm/qdl"; SRC_URI="https://github.com/linux-msm/qdl/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-${COMMIT_ID}" @@ -21,16 +21,16 @@ BDEPEND="virtual/libudev dev-libs/libxml2 " -PATCHES=( - "${FILESDIR}/makefile.patch" -) - src_compile() { - emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) + PKG_CONFIG=$(tc-getPKG_CONFIG) + emake CC=$(tc-getCC) \ + "CFLAGS=${CFLAGS} `${PKG_CONFIG} --cflags libxml-2.0`" \ + "LDFLAGS=${LDFLAGS} `${PKG_CONFIG} --libs libxml-2.0 libudev`" } src_install() { - default + emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install insinto "/usr/share/${PN}" doins LICENSE + dodoc README } diff --git a/dev-embedded/qdl/qdl-9999.ebuild b/dev-embedded/qdl/qdl-9999.ebuild index 748d9684f1..bd1405bbb4 100644 --- a/dev-embedded/qdl/qdl-9999.ebuild +++ b/dev-embedded/qdl/qdl-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit git-r3 toolchain-funcs DESCRIPTION="Tool to communicate with Qualcomm System On a Chip bootroms" -HOMEPAGE="https://github.com/andersson/qdl"; +HOMEPAGE="https://github.com/linux-msm/qdl"; EGIT_REPO_URI="https://github.com/andersson/qdl.git"; LICENSE="BSD" @@ -17,16 +17,17 @@ BDEPEND="virtual/libudev dev-libs/libxml2 " -PATCHES=( - "${FILESDIR}/makefile.patch" -) src_compile() { - emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) + PKG_CONFIG=$(tc-getPKG_CONFIG) + emake CC=$(tc-getCC) \ + "CFLAGS=${CFLAGS} `${PKG_CONFIG} --cflags libxml-2.0`" \ + "LDFLAGS=${LDFLAGS} `${PKG_CONFIG} --libs libxml-2.0 libudev`" } src_install() { - default + emake prefix="${EPREFIX}/usr" DESTDIR="${D}" install insinto "/usr/share/${PN}" doins LICENSE + dodoc README }
