mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: "Rafael J. Wysocki" <rjw@sisk.pl>,
	linux-kernel@vger.kernel.org, Andi Kleen <ak@suse.de>,
	Andrew Morton <akpm@osdl.org>
Subject: Re: 2.6.10-rc1-mm3: (fix for make xconfig)
Date: Mon, 8 Nov 2004 23:34:09 +0100	[thread overview]
Message-ID: <20041108223409.GB16261@mars.ravnborg.org> (raw)
In-Reply-To: <20041105202601.GA8785@mars.opasia.dk>

On Fri, Nov 05, 2004 at 09:26:01PM +0100, Sam Ravnborg wrote:
 
> Wrong fix.
> I will look into it later tonight.

Here is the fix. Tested with both xconfg and gconfig.

	Sam

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/11/06 21:18:02+01:00 sam@mars.ravnborg.org 
#   kconfig: fix xconfig and gconfig
#   
#   Patch that disabled use of loadable modules broke qconf and gconf.
#   Fixed by disabling this also for these targets.
#   
#   Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
# 
# scripts/kconfig/Makefile
#   2004/11/06 21:17:26+01:00 sam@mars.ravnborg.org +5 -4
#   Enable build of qconf anf gconf without loadable module support
# 
diff -Nru a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
--- a/scripts/kconfig/Makefile	2004-11-08 23:33:26 +01:00
+++ b/scripts/kconfig/Makefile	2004-11-08 23:33:26 +01:00
@@ -84,11 +84,11 @@
 
 ifeq ($(qconf-target),1)
 qconf-cxxobjs	:= qconf.o
-qconf-objs	:= kconfig_load.o
+qconf-objs	:= kconfig_load.o zconf.tab.o
 endif
 
 ifeq ($(gconf-target),1)
-gconf-objs	:= gconf.o kconfig_load.o
+gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
 endif
 
 clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
@@ -99,10 +99,11 @@
 HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 
 HOSTLOADLIBES_qconf	= -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(QTLIB) -ldl
-HOSTCXXFLAGS_qconf.o	= -I$(QTDIR)/include 
+HOSTCXXFLAGS_qconf.o	= -I$(QTDIR)/include -D LKC_DIRECT_LINK
 
 HOSTLOADLIBES_gconf	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
-HOSTCFLAGS_gconf.o	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags`
+HOSTCFLAGS_gconf.o	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` \
+                          -D LKC_DIRECT_LINK
 
 $(obj)/conf.o $(obj)/mconf.o $(obj)/qconf.o $(obj)/gconf.o: $(obj)/zconf.tab.h
 

  reply	other threads:[~2004-11-08 22:34 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-11-05  8:13 2.6.10-rc1-mm3 Andrew Morton
2004-11-05  9:41 ` 2.6.10-rc1-mm3 Lorenzo Allegrucci
2004-11-05 10:17   ` 2.6.10-rc1-mm3 Andrew Morton
2004-11-05 10:48     ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 12:36       ` 2.6.10-rc1-mm3 Lorenzo Allegrucci
2004-11-05 10:22   ` 2.6.10-rc1-mm3 Ingo Molnar
2004-11-05 10:38     ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 11:09     ` 2.6.10-rc1-mm3 Ingo Molnar
2004-11-05 11:17       ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 11:24         ` 2.6.10-rc1-mm3 Ingo Molnar
2004-11-05 11:43           ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 12:15           ` 2.6.10-rc1-mm3 Ingo Molnar
2004-11-05 12:22             ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 12:57               ` 2.6.10-rc1-mm3 Rafael J. Wysocki
2004-11-05 13:02                 ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 17:47                   ` 2.6.10-rc1-mm3 Rafael J. Wysocki
2004-11-05 11:20       ` 2.6.10-rc1-mm3 Russell King
2004-11-05 11:30         ` 2.6.10-rc1-mm3 Andi Kleen
2004-11-05 10:17 ` 2.6.10-rc1-mm3 Ingo Molnar
2004-11-05 15:54   ` 2.6.10-rc1-mm3 Michael Baehr
2004-11-05 10:56 ` 2.6.10-rc1-mm3 Con Kolivas
2004-11-05 16:45 ` 2.6.10-rc1-mm3: ACPI problem due to un-exported hotplug_path Adrian Bunk
2004-11-05 18:05   ` Greg KH
2004-11-05 20:10     ` Kay Sievers
2004-11-05 20:32       ` Ashok Raj
2004-11-05 20:43         ` Greg KH
2004-11-05 20:45         ` Kay Sievers
2004-11-05 20:42       ` Greg KH
2004-11-06  5:18         ` Keshavamurthy Anil S
2004-11-06  5:50           ` Dmitry Torokhov
2004-11-09 22:55           ` Greg KH
2004-11-09 23:48             ` [ACPI] " Dmitry Torokhov
2004-11-10  0:08               ` Greg KH
2004-11-10  4:15                 ` Dmitry Torokhov
2004-11-16  5:54                   ` Greg KH
2004-11-05 16:52 ` 2.6.10-rc1-mm3: drm_ati_pcigart_{init,cleanup} multiple definition Adrian Bunk
2004-11-05 17:19   ` Dave Airlie
2004-11-05 17:33     ` Jon Smirl
2004-11-05 18:07 ` 2.6.10-rc1-mm3 Rafael J. Wysocki
2004-11-05 18:48   ` 2.6.10-rc1-mm3: (fix for make xconfig) Rafael J. Wysocki
2004-11-05 20:26     ` Sam Ravnborg
2004-11-08 22:34       ` Sam Ravnborg [this message]
2004-11-05 18:07 ` 2.6.10-rc1-mm3 Adam Heath
2004-11-06  7:16 ` 2.6.10-rc1-mm3 Pasi Savolainen
2004-11-06  9:39 ` [PATCH][TRIVIAL] sched.c whitespace mangler Con Kolivas
2004-11-07  1:32 ` 2.6.10-rc1-mm3: "bttv card=" breakage Adrian Bunk
2004-11-07  2:15   ` Andrew Morton

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20041108223409.GB16261@mars.ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@sisk.pl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®