commit bf834fc
chld
·
2026-08-22 16:54:58 +0000 UTC
parent 26145f0
swiv: fix broken makefile linking
3 files changed,
+27,
-6
+4,
-1
1@@ -1,3 +1,6 @@
2 .wayland
3 .wayland-protocols
4-.pixman
5+.pixman
6+.u-config
7+/libdrm
8+/fontconfig
+21,
-0
1@@ -0,0 +1,21 @@
2+
3+--- Makefile
4++++ Makefile
5+@@ -8,7 +8,7 @@
6+ PROTO_XDG_CLIENT_C = ${PROTO_DIR}/xdg-shell-protocol.c
7+
8+ PKG_CFLAGS != $(PKG_CONFIG) --cflags wayland-client pixman-1 2>/dev/null || :
9+-PKG_LIBS != $(PKG_CONFIG) --libs wayland-client pixman-1 2>/dev/null || :
10++PKG_LIBS != $(PKG_CONFIG) --libs wayland-client pixman-1 libdrm fontconfig wld 2>/dev/null || :
11+
12+ CFLAGS ?= -O2 -g
13+ CFLAGS += -std=c99 -Wall -Wextra -Wpedantic
14+@@ -46,7 +46,7 @@
15+ ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
16+
17+ swiv: $(OBJECTS)
18+- ${CC} ${LDFLAGS} -o $@ ${OBJECTS} ${LDLIBS}
19++ ${CC} ${LDFLAGS} -o $@ ${OBJECTS} ${LDLIBS} ${PKG_LIBS}
20+
21+ clean:
22+ rm -f $(OBJECTS) swiv ${PROTO_XDG_CLIENT_H} ${PROTO_XDG_CLIENT_C}
+2,
-5
1@@ -2,10 +2,7 @@
2 NAME=swiv
3 VERSION=git
4 RELEASE=1
5-SOURCE="https://git.sr.ht/~shrub900/swiv"
6-build(){
7- make PREFIX="$PREFIX" DESTDIR="$PKG" CFLAGS='-static $(pkg)' LDFLAGS='-static' -j"$NPROC" || die "build failed"
8- make DESTDIR="$PKG" install || die "gmake install failed"
9-}
10+SOURCE="https://git.sr.ht/~shrub900/swiv
11+ fix-makefile.patch"
12
13 . ${0%/*}/../../libsh/libdmake.sh