From 0694341ea285477b75e9709aa8210a968b589ed0 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Wed, 23 Mar 2011 19:57:32 +0100 Subject: [PATCH] mine: fixed to use dialog-config to determine the needed LDFLAGS for libdialog This way we do not have to worry about if we have to link against the narrowc or the widec version of libncurses because dialog-config will return the right libs and flags we have to use. --- ...s.patch => gasgui-use-dialog-config.patch} | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) rename archiver/mine/{ncurses.patch => gasgui-use-dialog-config.patch} (50%) diff --git a/archiver/mine/ncurses.patch b/archiver/mine/gasgui-use-dialog-config.patch similarity index 50% rename from archiver/mine/ncurses.patch rename to archiver/mine/gasgui-use-dialog-config.patch index cd990349b..60e890a74 100644 --- a/archiver/mine/ncurses.patch +++ b/archiver/mine/gasgui-use-dialog-config.patch @@ -1,8 +1,8 @@ # --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# Filename: package/.../mine/ncurses.patch -# Copyright (C) 2006 The OpenSDE Project +# Filename: package/.../mine/gasgui-use-dialog-config.patch +# Copyright (C) 2011 The OpenSDE Project # # More information can be found in the files COPYING and README. # @@ -14,19 +14,27 @@ # version. # --- SDE-COPYRIGHT-NOTE-END --- -link against ncurses, not just curses. libcurses was not found. -missing compatibility link? +Description: Use dialog-config to determine the needed LDFLAGS for libdialog -amery +This way we do not have to worry about if we have to link against +the narrowc or the widec version of libncurses. ---- ./Makefile.orig 2006-09-06 11:12:35.000000000 +0000 -+++ ./Makefile 2006-09-06 11:12:46.000000000 +0000 -@@ -89,7 +89,7 @@ - $(CC) $(MINE_ALL_OBJS) -static -o mine.static +--- ./Makefile.orig 2011-03-23 17:33:23.964072236 +0100 ++++ ./Makefile 2011-03-23 18:48:53.956072238 +0100 +@@ -22,6 +22,7 @@ + # + GAS_VER = $(MINE_VER) + GAS_OBJ = gasgui.o readdb.o selector.o memdb.o ++GAS_DIALOG_LDFLAGS = $(shell dialog-config --libs) + + # Let's use AVL for the memory DB + # +@@ -83,7 +84,7 @@ + $(CC) -static $(MINE_ALL_OBJS) $(MINE_ALL_LIBS) -o mine.static gasgui: $(GAS_OBJ) - $(CC) $(GAS_OBJ) -ldialog -lcurses -lm -o gasgui -+ $(CC) $(GAS_OBJ) -ldialog -lncurses -lm -o gasgui ++ $(CC) $(GAS_OBJ) $(GAS_DIALOG_LDFLAGS) -o gasgui install: all install mine $(sysprefix)/bin/mine