From bcbe3a1fd031a7a69f1748b1b0caf667641f7a624e5f5c405a17f26ead115dee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 26 Aug 2020 12:11:30 +0000 Subject: [PATCH] - Add patch to not expect which to be in /bin: * hardcoded.patch OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/netsurf-buildsystem?expand=0&rev=5 --- hardcoded.patch | 13 +++++++++++++ netsurf-buildsystem.changes | 6 ++++++ netsurf-buildsystem.spec | 6 +++--- 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 hardcoded.patch diff --git a/hardcoded.patch b/hardcoded.patch new file mode 100644 index 0000000..2544c41 --- /dev/null +++ b/hardcoded.patch @@ -0,0 +1,13 @@ +Index: buildsystem-1.9/makefiles/Makefile.tools +=================================================================== +--- buildsystem-1.9.orig/makefiles/Makefile.tools ++++ buildsystem-1.9/makefiles/Makefile.tools +@@ -135,7 +135,7 @@ else + endif + + # Search the path for the compiler +- toolpath_ := $(shell /bin/which $(CC__)) ++ toolpath_ := $(shell which $(CC__)) + ifeq ($(toolpath_),) + toolpath_ := /opt/netsurf/$(HOST)/cross/bin/ + CC__ := $(toolpath_)$(HOST)-gcc diff --git a/netsurf-buildsystem.changes b/netsurf-buildsystem.changes index 61635e2..b53ad33 100644 --- a/netsurf-buildsystem.changes +++ b/netsurf-buildsystem.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 26 12:08:36 UTC 2020 - Tomáš Chvátal + +- Add patch to not expect which to be in /bin: + * hardcoded.patch + ------------------------------------------------------------------- Tue Aug 25 15:32:49 UTC 2020 - Dirk Mueller diff --git a/netsurf-buildsystem.spec b/netsurf-buildsystem.spec index 976484a..1eccbda 100644 --- a/netsurf-buildsystem.spec +++ b/netsurf-buildsystem.spec @@ -21,11 +21,10 @@ Name: netsurf-buildsystem Version: 1.9 Release: 0 Summary: Makefiles shared by NetSurf projects -# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines" License: MIT -Group: Development/Tools URL: https://www.netsurf-browser.org/ Source: http://download.netsurf-browser.org/libs/releases/%{src_name}-%{version}.tar.gz +Patch0: hardcoded.patch BuildArch: noarch %description @@ -33,11 +32,12 @@ BuildArch: noarch %prep %setup -q -n %{src_name}-%{version} +%autopatch -p1 %build %install -make install DESTDIR=%{buildroot} PREFIX=%{_prefix} +%make_install PREFIX=%{_prefix} %files %license COPYING