[gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/qdl/, dev-embedded/qdl/files/
commit: 4772891540f5809a3318c8bee143729a1c80b2a5 Author: Quincy Fleming protonmail com> AuthorDate: Tue Apr 9 22:30:30 2024 + Commit: Quincy Fleming protonmail com> CommitDate: Tue Apr 9 22:30:30 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=47728915 dev-embedded/qdl: update HOMEPAGE Signed-off-by: Quincy Fleming protonmail.com> dev-embedded/qdl/files/makefile.patch | 17 - dev-embedded/qdl/qdl-2024.4.9.ebuild | 14 +++--- dev-embedded/qdl/qdl-.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..00 --- 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-.ebuild b/dev-embedded/qdl/qdl-.ebuild index 748d9684f1..bd1405bbb4 100644 --- a/dev-embedded/qdl/qdl-.ebuild +++ b/dev-embedded/qdl/qdl-.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 }
[gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/qdl/, dev-embedded/qdl/files/
commit: 7188d3e8f978ff24d8740977fddebd110a5581a6 Author: Quincy Fleming protonmail com> AuthorDate: Tue Apr 9 15:12:36 2024 + Commit: Quincy Fleming protonmail com> CommitDate: Tue Apr 9 15:12:36 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=7188d3e8 dev-embedded/qdl: update, remove stdlib patch Signed-off-by: Quincy Fleming protonmail.com> dev-embedded/qdl/Manifest | 2 +- dev-embedded/qdl/files/include_stdlib.patch| 33 -- .../{qdl-20230411.ebuild => qdl-2024.4.9.ebuild} | 3 +- dev-embedded/qdl/qdl-.ebuild | 1 - 4 files changed, 2 insertions(+), 37 deletions(-) diff --git a/dev-embedded/qdl/Manifest b/dev-embedded/qdl/Manifest index e8e3e0b1c2..ab581535da 100644 --- a/dev-embedded/qdl/Manifest +++ b/dev-embedded/qdl/Manifest @@ -1 +1 @@ -DIST qdl-20230411.tar.gz 14561 BLAKE2B 6e80a2e6b8509abd1678dfda244130499655dd9a5a923149f41c22791b1f52ecc6166d09012f1cf1cb4ec954dc20669aa0e566956750b381827e8dd1df829ed3 SHA512 ebd45bfdec65c7a9c0c8a0e187b73940342988bb3ca3bfd7cf84f08cef90afa5c5331f0ccb047f580d9209ded7f4e4ca4146c7f9a4fe4a7ab3a88c2406c7903d +DIST qdl-2024.4.9.tar.gz 14576 BLAKE2B 4eba1733b62114d77c41076b9830d6158aea2ab2a707a33fa2a22135827d17929d11fe4667ba97d97e55725e6fdff08173dc9030e581b435b53d6d2904dfcf3a SHA512 467f7f06eba1b32ac25a36f001743fda55a1a4b91cff63a22966383505ccc1a15fa5bde4f848c1962a38f6395080c192a372d6168b5075acfe42073af181345c diff --git a/dev-embedded/qdl/files/include_stdlib.patch b/dev-embedded/qdl/files/include_stdlib.patch deleted file mode 100644 index f2e34743fc..00 --- a/dev-embedded/qdl/files/include_stdlib.patch +++ /dev/null @@ -1,33 +0,0 @@ -#Created by Quincy Fleming -#Failure to compile without include "" -#Bug: https://bugs.gentoo.org/927801 a/patch.c -+++ b/patch.c -@@ -30,6 +30,7 @@ - */ - #include - #include -+#include - #include - #include - a/program.c -+++ b/program.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include a/util.c -+++ b/util.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/dev-embedded/qdl/qdl-20230411.ebuild b/dev-embedded/qdl/qdl-2024.4.9.ebuild similarity index 88% rename from dev-embedded/qdl/qdl-20230411.ebuild rename to dev-embedded/qdl/qdl-2024.4.9.ebuild index 1b463b9645..dcba98c9b0 100644 --- a/dev-embedded/qdl/qdl-20230411.ebuild +++ b/dev-embedded/qdl/qdl-2024.4.9.ebuild @@ -6,7 +6,7 @@ EAPI=8 inherit toolchain-funcs DESCRIPTION="Tool to communicate with Qualcomm System On a Chip bootroms" -COMMIT_ID="3b22df2bc7de02d867334af3a7aa8606db4f8cdd" +COMMIT_ID="a629f43428ebd17080f55543f893d45694234f75" HOMEPAGE="https://github.com/andersson/qdl; SRC_URI="https://github.com/linux-msm/qdl/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" @@ -23,7 +23,6 @@ BDEPEND="virtual/libudev PATCHES=( "${FILESDIR}/makefile.patch" - "${FILESDIR}/include_stdlib.patch" ) src_compile() { diff --git a/dev-embedded/qdl/qdl-.ebuild b/dev-embedded/qdl/qdl-.ebuild index 263372f242..748d9684f1 100644 --- a/dev-embedded/qdl/qdl-.ebuild +++ b/dev-embedded/qdl/qdl-.ebuild @@ -19,7 +19,6 @@ BDEPEND="virtual/libudev PATCHES=( "${FILESDIR}/makefile.patch" - "${FILESDIR}/include_stdlib.patch" ) src_compile() {
[gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/qdl/, dev-embedded/qdl/files/
commit: f261dc848b22ac3987b5ad1277339dd17916a9fa Author: Quincy Fleming protonmail com> AuthorDate: Mon Mar 25 20:11:48 2024 + Commit: Quincy Fleming protonmail com> CommitDate: Mon Mar 25 20:11:48 2024 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f261dc84 dev-embedded/qdl: Fix gcc-14 compile errors Bug: https://bugs.gentoo.org/927801 Signed-off-by: Quincy Fleming protonmail.com> dev-embedded/qdl/files/include_stdlib-1.0.patch | 23 + dev-embedded/qdl/files/include_stdlib-.patch | 33 dev-embedded/qdl/qdl-1.0.ebuild | 5 +++- dev-embedded/qdl/qdl-.ebuild | 5 +++- 4 files changed, 64 insertions(+), 2 deletions(-) diff --git a/dev-embedded/qdl/files/include_stdlib-1.0.patch b/dev-embedded/qdl/files/include_stdlib-1.0.patch new file mode 100644 index 00..c2b4a49729 --- /dev/null +++ b/dev-embedded/qdl/files/include_stdlib-1.0.patch @@ -0,0 +1,23 @@ +#Created by Quincy Fleming +#Failure to compile without include "" +#Bug: https://bugs.gentoo.org/927801 +--- a/patch.c b/patch.c +@@ -30,6 +30,7 @@ + */ + #include + #include ++#include + #include + #include + +--- a/program.c b/program.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/dev-embedded/qdl/files/include_stdlib-.patch b/dev-embedded/qdl/files/include_stdlib-.patch new file mode 100644 index 00..f2e34743fc --- /dev/null +++ b/dev-embedded/qdl/files/include_stdlib-.patch @@ -0,0 +1,33 @@ +#Created by Quincy Fleming +#Failure to compile without include "" +#Bug: https://bugs.gentoo.org/927801 +--- a/patch.c b/patch.c +@@ -30,6 +30,7 @@ + */ + #include + #include ++#include + #include + #include + +--- a/program.c b/program.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/util.c b/util.c +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/dev-embedded/qdl/qdl-1.0.ebuild b/dev-embedded/qdl/qdl-1.0.ebuild index e06c2fd64f..7b7835782f 100644 --- a/dev-embedded/qdl/qdl-1.0.ebuild +++ b/dev-embedded/qdl/qdl-1.0.ebuild @@ -18,7 +18,10 @@ BDEPEND="virtual/libudev dev-libs/libxml2 " -PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}/include_stdlib-${PV}.patch" +) src_compile() { emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) diff --git a/dev-embedded/qdl/qdl-.ebuild b/dev-embedded/qdl/qdl-.ebuild index 5421ecdc40..3832903dcb 100644 --- a/dev-embedded/qdl/qdl-.ebuild +++ b/dev-embedded/qdl/qdl-.ebuild @@ -17,7 +17,10 @@ BDEPEND="virtual/libudev dev-libs/libxml2 " -PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) +PATCHES=( + "${FILESDIR}/${P}-makefile.patch" + "${FILESDIR}/include_stdlib-${PV}.patch" +) src_compile() { emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG)
[gentoo-commits] repo/proj/guru:dev commit in: dev-embedded/qdl/, dev-embedded/qdl/files/
commit: 390eeecd09107fe1e175cb723d771162ee2e3d1b Author: Quincy Fleming protonmail com> AuthorDate: Tue Jul 18 17:56:49 2023 + Commit: Quincy Fleming protonmail com> CommitDate: Tue Jul 18 17:56:49 2023 + URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=390eeecd dev-embedded/qdl: respect user CFLAGS and LDFLAGS Signed-off-by: Quincy Fleming protonmail.com> dev-embedded/qdl/files/qdl-1.0-makefile.patch | 17 + dev-embedded/qdl/files/qdl--makefile.patch | 17 + dev-embedded/qdl/qdl-1.0.ebuild| 13 ++--- dev-embedded/qdl/qdl-.ebuild | 13 + 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/dev-embedded/qdl/files/qdl-1.0-makefile.patch b/dev-embedded/qdl/files/qdl-1.0-makefile.patch new file mode 100755 index 0..e6c7ab122 --- /dev/null +++ b/dev-embedded/qdl/files/qdl-1.0-makefile.patch @@ -0,0 +1,17 @@ +#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 `xml2-config --cflags` +-LDFLAGS := `xml2-config --libs` +-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 + OBJS := $(SRCS:.c=.o) diff --git a/dev-embedded/qdl/files/qdl--makefile.patch b/dev-embedded/qdl/files/qdl--makefile.patch new file mode 100755 index 0..a24de2b5c --- /dev/null +++ b/dev-embedded/qdl/files/qdl--makefile.patch @@ -0,0 +1,17 @@ +#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-1.0.ebuild b/dev-embedded/qdl/qdl-1.0.ebuild index 5e2fb597a..90d2b54ed 100644 --- a/dev-embedded/qdl/qdl-1.0.ebuild +++ b/dev-embedded/qdl/qdl-1.0.ebuild @@ -3,6 +3,8 @@ EAPI=8 +inherit toolchain-funcs + DESCRIPTION="Tool to communicate with Qualcomm System On a Chip bootroms" HOMEPAGE="https://github.com/andersson/qdl; SRC_URI="https://github.com/andersson/qdl/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" @@ -12,13 +14,18 @@ SLOT="0" KEYWORDS="~amd64" BDEPEND="virtual/libudev + virtual/pkgconfig dev-libs/libxml2 " -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install +PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) - dodoc README +src_compile() { + emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) +} + +src_install() { + default insinto "/usr/share/${PN}" doins LICENSE } diff --git a/dev-embedded/qdl/qdl-.ebuild b/dev-embedded/qdl/qdl-.ebuild index 7f17fadec..d1c29872e 100644 --- a/dev-embedded/qdl/qdl-.ebuild +++ b/dev-embedded/qdl/qdl-.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit git-r3 +inherit git-r3 toolchain-funcs DESCRIPTION="Tool to communicate with Qualcomm System On a Chip bootroms" HOMEPAGE="https://github.com/andersson/qdl; @@ -13,13 +13,18 @@ LICENSE="BSD-3" SLOT="0" BDEPEND="virtual/libudev + virtual/pkgconfig dev-libs/libxml2 " -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install +PATCHES=( "${FILESDIR}/${P}-makefile.patch" ) + +src_compile() { + emake CC=$(tc-getCC) PKG_CONFIG=$(tc-getPKG_CONFIG) +} - dodoc README +src_install() { + default insinto "/usr/share/${PN}" doins LICENSE }