Menu
▾
▴
mesa3d-dev
|
From: Jeremy H. <jer...@fr...> - 2010-04-01 19:54:59
|
Signed-off-by: Jeremy Huddleston <jer...@ap...> --- progs/xdemos/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile index e87d55d..d5c627a 100644 --- a/progs/xdemos/Makefile +++ b/progs/xdemos/Makefile @@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Add X11 and pthread libs to satisfy GNU gold. APP_LIB_DEPS += -lX11 -lpthread -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_LIB_DIR) $(APP_LIB_DEPS) PROGS = \ corender \ -- 1.7.0.3 |
|
From: Dan N. <dbn...@gm...> - 2010-04-01 21:10:53
|
On Thu, Apr 1, 2010 at 12:35 PM, Jeremy Huddleston <jer...@fr...> wrote: > > Signed-off-by: Jeremy Huddleston <jer...@ap...> > --- > progs/xdemos/Makefile | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile > index e87d55d..d5c627a 100644 > --- a/progs/xdemos/Makefile > +++ b/progs/xdemos/Makefile > @@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) > # Add X11 and pthread libs to satisfy GNU gold. > APP_LIB_DEPS += -lX11 -lpthread > > -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) > +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_LIB_DIR) $(APP_LIB_DEPS) Is this against master? We changed this to use $(X11_LIBS), which is unfortunately only filled in by configure. BTW, what config are you using, and what prevents you from using autoconf? -- Dan |
|
From: Jeremy H. <jer...@fr...> - 2010-04-01 21:37:06
|
On Apr 1, 2010, at 14:10, Dan Nicholson wrote: > On Thu, Apr 1, 2010 at 12:35 PM, Jeremy Huddleston > <jer...@fr...> wrote: >> >> Signed-off-by: Jeremy Huddleston <jer...@ap...> >> --- >> progs/xdemos/Makefile | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile >> index e87d55d..d5c627a 100644 >> --- a/progs/xdemos/Makefile >> +++ b/progs/xdemos/Makefile >> @@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) >> # Add X11 and pthread libs to satisfy GNU gold. >> APP_LIB_DEPS += -lX11 -lpthread >> >> -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) >> +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_LIB_DIR) $(APP_LIB_DEPS) > > Is this against master? We changed this to use $(X11_LIBS), which is > unfortunately only filled in by configure. BTW, what config are you > using, and what prevents you from using autoconf? This is against 7.8 ... perhaps you should cherry-pick the appropriate change into the 7.8 branch then. I'm using the "darwin" config. I can't use autoconf because it is nowhere near capable of handling darwin, and I haven't wanted to address the issue until the transition to autotools was completed. |
|
From: Dan N. <dbn...@gm...> - 2010-04-01 22:12:50
|
On Thu, Apr 1, 2010 at 2:36 PM, Jeremy Huddleston <jer...@fr...> wrote: > > On Apr 1, 2010, at 14:10, Dan Nicholson wrote: > >> On Thu, Apr 1, 2010 at 12:35 PM, Jeremy Huddleston >> <jer...@fr...> wrote: >>> >>> Signed-off-by: Jeremy Huddleston <jer...@ap...> >>> --- >>> progs/xdemos/Makefile | 2 +- >>> 1 files changed, 1 insertions(+), 1 deletions(-) >>> >>> diff --git a/progs/xdemos/Makefile b/progs/xdemos/Makefile >>> index e87d55d..d5c627a 100644 >>> --- a/progs/xdemos/Makefile >>> +++ b/progs/xdemos/Makefile >>> @@ -11,7 +11,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) >>> # Add X11 and pthread libs to satisfy GNU gold. >>> APP_LIB_DEPS += -lX11 -lpthread >>> >>> -LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(libdir) $(APP_LIB_DEPS) >>> +LIBS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_LIB_DIR) $(APP_LIB_DEPS) >> >> Is this against master? We changed this to use $(X11_LIBS), which is >> unfortunately only filled in by configure. BTW, what config are you >> using, and what prevents you from using autoconf? > > This is against 7.8 ... perhaps you should cherry-pick the appropriate change into the 7.8 branch then. Well, now I'm getting conflicts because you pushed this patch 25 minutes after you posted it. I'll try to straighten it out, though. > I'm using the "darwin" config. I can't use autoconf because it is nowhere near capable of handling darwin, and I haven't wanted to address the issue until the transition to autotools was completed. I don't know if there is more of a transition to complete. -- Dan |
|
From: tom f. <tf...@al...> - 2010-04-01 22:14:06
|
Jeremy Huddleston <jer...@fr...> writes: > > BTW, what config are you using, and what prevents you from using > > autoconf? > > I can't use autoconf because it is nowhere near capable of handling > darwin, and I haven't wanted to address the issue until the > transition to autotools was completed. We're building swrast on Darwin using autoconf, and have been since 7.4. I know of an issue with glu on OS X 10.4, but other than that things were fine, last I checked (been a while, admittedly). Could you please report bugs / ping this ML with your autoconf build issues on Darwin? -tom |
|
From: Jeremy H. <jer...@fr...> - 2010-04-02 00:15:00
|
On Apr 1, 2010, at 15:13, tom fogal wrote: > Jeremy Huddleston <jer...@fr...> writes: >>> BTW, what config are you using, and what prevents you from using >>> autoconf? >> >> I can't use autoconf because it is nowhere near capable of handling >> darwin, and I haven't wanted to address the issue until the >> transition to autotools was completed. > > We're building swrast on Darwin using autoconf, and have been since > 7.4. I know of an issue with glu on OS X 10.4, but other than that > things were fine, last I checked (been a while, admittedly). > > Could you please report bugs / ping this ML with your autoconf build > issues on Darwin? Last time I did, I was just told that I should address it when I get time, and I never got time. ;p I don't even remember what the problems were any more, but when I try next time, I'll ping the list. I believe at the time there was PKG_CONFIG-foo for libdrm, dri2proto, etc which were obviously not relevant to darwin. --Jeremy |
|
From: Jon T. <jon...@dr...> - 2010-04-02 12:36:48
|
On 02/04/2010 01:14, Jeremy Huddleston wrote: > On Apr 1, 2010, at 15:13, tom fogal wrote: >> Jeremy Huddleston<jer...@fr...> writes: >>>> BTW, what config are you using, and what prevents you from using >>>> autoconf? >>> >>> I can't use autoconf because it is nowhere near capable of handling >>> darwin, and I haven't wanted to address the issue until the >>> transition to autotools was completed. >> >> We're building swrast on Darwin using autoconf, and have been since >> 7.4. I know of an issue with glu on OS X 10.4, but other than that >> things were fine, last I checked (been a while, admittedly). >> >> Could you please report bugs / ping this ML with your autoconf build >> issues on Darwin? > > Last time I did, I was just told that I should address it when I get time, > and I never got time. ;p > > I don't even remember what the problems were any more, but when I try next > time, I'll ping the list. I believe at the time there was PKG_CONFIG-foo > for libdrm, dri2proto, etc which were obviously not relevant to darwin. If I'm guessing correctly about what the problem is here, you might find the patch [1] I posted useful as a starting point. [1] http://sourceforge.net/mailarchive/forum.php?thread_name=20100226152354.GA1960%40byron&forum_name=mesa3d-dev |
|
From: Jeremy H. <jer...@fr...> - 2010-04-02 00:15:39
|
On Apr 1, 2010, at 15:12, Dan Nicholson wrote: >> This is against 7.8 ... perhaps you should cherry-pick the appropriate change into the 7.8 branch then. > > Well, now I'm getting conflicts because you pushed this patch 25 > minutes after you posted it. I'll try to straighten it out, though. Sorry. Should work now. I reverted my accidental commit. >> I'm using the "darwin" config. I can't use autoconf because it is nowhere near capable of handling darwin, and I haven't wanted to address the issue until the transition to autotools was completed. > > I don't know if there is more of a transition to complete. Oh, I thought that automake was in the plans... Well, I'll look into supporting autoconf on darwin glx once I finish bringing the two trains back together. |
|
From: Dan N. <dbn...@gm...> - 2010-04-02 13:44:48
|
On Thu, Apr 1, 2010 at 5:15 PM, Jeremy Huddleston <jer...@fr...> wrote: > > On Apr 1, 2010, at 15:12, Dan Nicholson wrote: > >>> This is against 7.8 ... perhaps you should cherry-pick the appropriate change into the 7.8 branch then. >> >> Well, now I'm getting conflicts because you pushed this patch 25 >> minutes after you posted it. I'll try to straighten it out, though. > > Sorry. Should work now. I reverted my accidental commit. OK, I cherry-picked the 4 commits back to the 7.8 branch. This was my fault anyway since I forgot about the policy of committing on the old branch and waiting for it to get merged forward. Having a look at the darwin config, I think it will just work since you guys have the correct Xlib in APP_LIB_DEPS. This is a minor attempt to split those up some, so you can set X11_LIBS if you want. -- Dan |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X