diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-07-30 00:16:52 +0300 |
commit | bb6a14e2f317abf60677c6ad8de9c33d5760bf36 (patch) | |
tree | 00457d3677e86437cec25fd7dab6c4513a53b1a4 /meta-openembedded/meta-oe/recipes-graphics/surf | |
parent | defdca82c107f46e980c84bffb1b2c1263522fa0 (diff) | |
parent | cf6fd27dbd8e2d1b507f8c3752b85801b2c6ef57 (diff) | |
download | openbmc-bb6a14e2f317abf60677c6ad8de9c33d5760bf36.tar.xz |
Merge tag '0.63' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-graphics/surf')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch | 35 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb (renamed from meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb) | 6 |
2 files changed, 14 insertions, 27 deletions
diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch index fb90432ea..93f1a9f42 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch @@ -1,41 +1,28 @@ -From e97bb73851f5bbd94260da553a222526485cdfb1 Mon Sep 17 00:00:00 2001 +From 9de4f5fa81891e14e205fe61e1408f1218369e55 Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> -Date: Fri, 15 Nov 2019 18:24:42 +0000 +Date: Tue, 18 May 2021 15:03:22 +0000 Subject: [PATCH] config.mk: Fix compiler and linker -Do not set explicitly compiler and linker. +Fix LIBS Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- - config.mk | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) + config.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.mk b/config.mk -index df6e812..5deb991 100644 +index 2eb9fb0..032bf9f 100644 --- a/config.mk +++ b/config.mk -@@ -15,17 +15,17 @@ GTKINC = `pkg-config --cflags gtk+-3.0 webkit2gtk-4.0` - GTKLIB = `pkg-config --libs gtk+-3.0 webkit2gtk-4.0` +@@ -19,7 +19,7 @@ WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio- # includes and libs --INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} --LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 -+INCS = ${GTKINC} + INCS = $(X11INC) $(GTKINC) +-LIBS = $(X11LIB) $(GTKLIB) -lgthread-2.0 +LIBS = -lc -lX11 ${GTKLIB} -lgthread-2.0 # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" -DWEBEXTDIR=\"${LIBPREFIX}\" -D_DEFAULT_SOURCE - CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS} --LDFLAGS = -s ${LIBS} -+LDFLAGS = ${LIBS} - - # Solaris - #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\" - #LDFLAGS = ${LIBS} - - # compiler and linker --CC = cc -+CC ?= cc + CPPFLAGS = -DVERSION=\"$(VERSION)\" -DGCR_API_SUBJECT_TO_CHANGE \ -- -2.7.4 +2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb index 989730186..307ee9b98 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -3,16 +3,16 @@ DESCRIPTION = "Simple open source web browser based on WebKit2/GTK" HOMEPAGE = "https://surf.suckless.org/" SECTION = "x11/graphics" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=b57e7f7720307a02d5a6598b00fe3afa" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6f86d002ae9ae1eb1ccc466289f146" -DEPENDS = "webkitgtk gtk+3 glib-2.0" +DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr" REQUIRED_DISTRO_FEATURES = "x11 opengl" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ file://0001-config.mk-Fix-compiler-and-linker.patch \ " -SRCREV = "b814567e2bf8bda07cea8de1c7a062f4aa437b65" +SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" S = "${WORKDIR}/git" |