diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /app-misc/wcd/files/wcd-5.2.5-gentoo.patch | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-misc/wcd/files/wcd-5.2.5-gentoo.patch')
| -rw-r--r-- | app-misc/wcd/files/wcd-5.2.5-gentoo.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch new file mode 100644 index 000000000000..c838e131aa5f --- /dev/null +++ b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch @@ -0,0 +1,72 @@ + src/Makefile | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index d4120cc..4505b8d 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -46,12 +46,12 @@ include version.mk + + CC ?= gcc + STATIC = +-STRIP = strip ++STRIP = + + ENABLE_NLS = 1 + + PACKAGE = wcd +-EXT = .exe ++EXT = + PROGRAM = $(PACKAGE)$(EXT) + BIN = $(PROGRAM) + +@@ -188,9 +188,9 @@ endif + # possible values: ncurses, curses, pdcurses, pdcursesw or <empty> + + ifdef UCS +- CURSES = ncursesw ++ CURSES = $(shell pkg-config --libs ncursesw) + else +- CURSES = ncurses ++ CURSES = $(shell pkg-config --libs ncurses) + endif + + ifdef CURSES +@@ -201,7 +201,7 @@ endif + + ifneq (,$(CURSES)) + DEFS_CURSES = -DWCD_USECURSES +- LIB_CURSES = -l$(CURSES) ++ LIB_CURSES = $(CURSES) + endif + + +@@ -406,15 +406,15 @@ ifdef ASCII_TREE + endif + + LDFLAGS_USER = +-LDFLAGS = $(RPM_OPT_FLAGS) \ ++LIBS = $(RPM_OPT_FLAGS) \ + $(LDFLAGS_EXTRA) \ + $(NLFLAG) \ + $(LDFLAG_STATIC) \ + $(LDFLAGS_USER) + +-LIBS = $(LIB_CURSES) \ +- $(LIB_UNISTRING) \ +- $(LIBS_EXTRA) ++LIBS += $(LIB_CURSES) \ ++ $(LIB_UNISTRING) \ ++ $(LIBS_EXTRA) + + DEFS_USER = + DEFS = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER) +@@ -470,7 +470,7 @@ status: + + $(BIN): $(OBJS1) + $(MAKE) status +- $(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@ ++ $(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS) + + %.o: %.c + $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@ |