From: Ankur Tyagi <[email protected]> Dropped patches which are part of upstream version
- 0001-Fix-build-race-in-Makefile.patch [1] - no-strip.patch [2] [1] https://github.com/nigels-com/glew/commit/767e0316450911f1158bd4f7fd8dcd066bae5c55 [2] https://github.com/nigels-com/glew/commit/d7693eea09ac76c67f5f3aa538bb911ce2291e2c Signed-off-by: Ankur Tyagi <[email protected]> --- .../0001-Fix-build-race-in-Makefile.patch | 56 ------------------- .../recipes-graphics/glew/glew/no-strip.patch | 12 ---- .../glew/{glew_2.2.0.bb => glew_2.3.1.bb} | 5 +- 3 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch delete mode 100644 meta/recipes-graphics/glew/glew/no-strip.patch rename meta/recipes-graphics/glew/{glew_2.2.0.bb => glew_2.3.1.bb} (90%) diff --git a/meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch b/meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch deleted file mode 100644 index 2418646689..0000000000 --- a/meta/recipes-graphics/glew/glew/0001-Fix-build-race-in-Makefile.patch +++ /dev/null @@ -1,56 +0,0 @@ -Upstream-Status: Backport [767e0316450911f1158bd4f7fd8dcd066bae5c55] -Signed-off-by: Ross Burton <[email protected]> - -From 0ce0a85597db48a2fca619bd95e34af091e54ae8 Mon Sep 17 00:00:00 2001 -From: Ross Burton <[email protected]> -Date: Thu, 22 Jul 2021 16:31:11 +0100 -Subject: [PATCH] Fix build race in Makefile - -The current rule for the binaries is: - -glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) - -In parallel builds, all of those targets happen at the same time. This -means that 'bin' can happen *after* 'bin/$(GLEWINFO.BIN)', which is a -problem as the 'bin' target's responsibility is to create the directory -that the other target writes into. - -Solve this by not having a separate 'create directory' target which is -fundamentally racy, and simply mkdir in each target which writes into it. ---- - Makefile | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index d0e4614..04af44c 100644 ---- a/Makefile -+++ b/Makefile -@@ -171,21 +171,20 @@ VISUALINFO.BIN.OBJ := $(VISUALINFO.BIN.OBJ:.c=.o) - # Don't build glewinfo or visualinfo for NaCL, yet. - - ifneq ($(filter nacl%,$(SYSTEM)),) --glew.bin: glew.lib bin -+glew.bin: glew.lib - else --glew.bin: glew.lib bin bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) -+glew.bin: glew.lib bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) - endif - --bin: -- mkdir bin -- - bin/$(GLEWINFO.BIN): $(GLEWINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) -+ @mkdir -p $(dir $@) - $(CC) $(CFLAGS) -o $@ $(GLEWINFO.BIN.OBJ) $(BIN.LIBS) - ifneq ($(STRIP),) - $(STRIP) -x $@ - endif - - bin/$(VISUALINFO.BIN): $(VISUALINFO.BIN.OBJ) $(LIB.SHARED.DIR)/$(LIB.SHARED) -+ @mkdir -p $(dir $@) - $(CC) $(CFLAGS) -o $@ $(VISUALINFO.BIN.OBJ) $(BIN.LIBS) - ifneq ($(STRIP),) - $(STRIP) -x $@ --- -2.25.1 - diff --git a/meta/recipes-graphics/glew/glew/no-strip.patch b/meta/recipes-graphics/glew/glew/no-strip.patch deleted file mode 100644 index 5708d93082..0000000000 --- a/meta/recipes-graphics/glew/glew/no-strip.patch +++ /dev/null @@ -1,12 +0,0 @@ -Don't forcibly strip the binaries. - -Signed-off-by: Ross Burton <[email protected]> -Upstream-Status: Backport [d7693eea09ac76c67f5f3aa538bb911ce2291e2c] - -diff --git a/Makefile b/Makefile -index 6a9803c..170c0ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -285 +285 @@ install.bin: glew.bin -- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" -+ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" diff --git a/meta/recipes-graphics/glew/glew_2.2.0.bb b/meta/recipes-graphics/glew/glew_2.3.1.bb similarity index 90% rename from meta/recipes-graphics/glew/glew_2.2.0.bb rename to meta/recipes-graphics/glew/glew_2.3.1.bb index b82b25c602..fb4b866fd2 100644 --- a/meta/recipes-graphics/glew/glew_2.2.0.bb +++ b/meta/recipes-graphics/glew/glew_2.3.1.bb @@ -6,11 +6,10 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ - file://0001-Fix-build-race-in-Makefile.patch \ file://notempdir.patch \ - file://no-strip.patch" +" -SRC_URI[sha256sum] = "d4fc82893cfb00109578d0a1a2337fb8ca335b3ceccf97b97e5cc7f08e4353e1" +SRC_URI[sha256sum] = "b64790f94b926acd7e8f84c5d6000a86cb43967bd1e688b03089079799c9e889" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew"; UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/"
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#229980): https://lists.openembedded.org/g/openembedded-core/message/229980 Mute This Topic: https://lists.openembedded.org/mt/117466030/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
