- add dont-strip.patch for not stripping the main binary (so we can

create debuginfo package)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/forgejo?expand=0&rev=39
This commit is contained in:
Richard Rahl 2024-10-09 15:38:00 +00:00 committed by Git OBS Bridge
parent 7f8373dfb5
commit d5738d2684
3 changed files with 36 additions and 2 deletions

28
dont-strip.patch Normal file
View File

@ -0,0 +1,28 @@
diff -rub forgejo-src-8.0.3/Makefile forgejo-src-8.0.3-patched/Makefile
--- forgejo-src-8.0.3/Makefile 2024-09-06 14:33:46.000000000 +0200
+++ forgejo-src-8.0.3-patched/Makefile 2024-10-09 15:01:55.191532699 +0200
@@ -784,7 +784,7 @@
.PHONY: install $(TAGS_PREREQ)
install: $(wildcard *.go)
- CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) install -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)'
+ CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) install -v -tags '$(TAGS)' -ldflags '$(LDFLAGS)'
.PHONY: build
build: frontend backend
@@ -816,13 +816,13 @@
go run $(GOVULNCHECK_PACKAGE) ./...
$(EXECUTABLE): $(GO_SOURCES) $(TAGS_PREREQ)
- CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
+ CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags '$(TAGS)' -ldflags '$(LDFLAGS)' -o $@
forgejo: $(EXECUTABLE)
ln -f $(EXECUTABLE) forgejo
static-executable: $(GO_SOURCES) $(TAGS_PREREQ)
- CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags 'netgo osusergo $(TAGS)' -ldflags '-s -w -linkmode external -extldflags "-static" $(LDFLAGS)' -o $(EXECUTABLE)
+ CGO_CFLAGS="$(CGO_CFLAGS)" $(GO) build $(GOFLAGS) $(EXTRA_GOFLAGS) -tags 'netgo osusergo $(TAGS)' -ldflags '-linkmode external -extldflags "-static" $(LDFLAGS)' -o $(EXECUTABLE)
.PHONY: release
release: frontend generate release-linux release-copy release-compress vendor release-sources release-check

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 9 13:22:28 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
- add dont-strip.patch for not stripping the main binary (so we can
create debuginfo package)
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 9 05:46:17 UTC 2024 - Tuukka Pasanen <tuukka.pasanen@ilmi.fi> Wed Oct 9 05:46:17 UTC 2024 - Tuukka Pasanen <tuukka.pasanen@ilmi.fi>

View File

@ -51,6 +51,7 @@ Source10: %{name}.apparmor
Source11: %{name}.firewalld Source11: %{name}.firewalld
Source99: get-sources.sh Source99: get-sources.sh
Patch0: custom-app.ini.patch Patch0: custom-app.ini.patch
Patch1: dont-strip.patch
BuildRequires: golang-packaging BuildRequires: golang-packaging
BuildRequires: golang(API) = 1.22 BuildRequires: golang(API) = 1.22
## node >= 20 ## node >= 20
@ -134,10 +135,9 @@ local-npm-registry %{_sourcedir} install --also=dev
%build %build
%sysusers_generate_pre %{SOURCE6} %{name} %{name}.conf %sysusers_generate_pre %{SOURCE6} %{name} %{name}.conf
export EXTRA_GOFLAGS="-buildmode=pie -mod=vendor"
export TAGS="bindata timetzdata sqlite sqlite_unlock_notify" export TAGS="bindata timetzdata sqlite sqlite_unlock_notify"
%make_build build %make_build build
go build ${EXTRA_GOFLAGS} -o contrib/environment-to-ini/environment-to-ini contrib/environment-to-ini/environment-to-ini.go go build -buildmode=pie -mod=vendor -o contrib/environment-to-ini/environment-to-ini contrib/environment-to-ini/environment-to-ini.go
%install %install
install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_bindir}