mjhaas n00b
Joined: 30 Nov 2002 Posts: 5
|
Posted: Sat Jan 11, 2003 12:08 pm Post subject: wmsmixer-0.5 and xfree-4.2.1-r2 |
|
|
This made me scratch my head for a long time so here's the solution for anyone else in the same pickle.
I could not install wmsmixer-0.5 on a system with xfree-4.2.1-r2 although I could on a system with xfree-4.2.1. Patching Makefile was only partially successful and subsequently the compilation failed terminally.
It turned out that Makefile in wmsmixer is created by xmkmf a component of xfree and it seems the versions on the two systems produce different results.
The solution is a new /usr/portage/x11-plugins/wmsmixer/files/makefile.diff for xfree-4.2.1-r2:
Code: | --- Makefile.orig 2003-01-11 01:23:04.000000000 +0000
+++ Makefile 2003-01-11 01:28:02.000000000 +0000
@@ -146,12 +146,12 @@
AR = ar clq
BOOTSTRAPCFLAGS =
- CC = gcc
+ CC = g++
AS = as
.SUFFIXES: .cc
- CXX = c++
+ CXX = g++
CXXFILT = c++filt
CXXLIB =
CXXDEBUGFLAGS = -O2 -fno-strength-reduce
@@ -969,36 +969,6 @@
fi
$(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) wmsmixer $(DESTDIR)$(BINDIR)/wmsmixer
-all:: wmsmixer.$(MANSUFFIX).html
-
-wmsmixer.$(MANSUFFIX).html: wmsmixer.$(MANNEWSUFFIX)
- $(RM) wmsmixer.$(MANSUFFIX).html wmsmixer.$(MANSUFFIX)-html
- $(RMAN) $(RMANOPTIONS) < wmsmixer.$(MANNEWSUFFIX) \
- > wmsmixer.$(MANSUFFIX)-html && $(MV) wmsmixer.$(MANSUFFIX)-html $@
-
-install.man:: wmsmixer.$(MANSUFFIX).html
- @if [ -d $(DESTDIR)$(DOCHTMLDIR) ]; then \
- set +x; \
- else \
- if [ -h $(DESTDIR)$(DOCHTMLDIR) ]; then \
- (set -x; rm -f $(DESTDIR)$(DOCHTMLDIR)); \
- fi; \
- (set -x; $(MKDIRHIER) $(DESTDIR)$(DOCHTMLDIR)); \
- fi
- @(SUF=`expr $(MANSUFFIX) \: '\(.\)'`; \
- set -x; \
- $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) wmsmixer.$(MANSUFFIX).html $(DESTDIR)$(DOCHTMLDIR)/wmsmixer.$$SUF.html)
-
-cleandir::
- $(RM) wmsmixer.$(MANSUFFIX).html wmsmixer.$(MANSUFFIX)-html
-
-all:: wmsmixer.$(MANNEWSUFFIX)
-
-wmsmixer.$(MANNEWSUFFIX): wmsmixer.$(MANSRCSUFFIX)
- $(RM) $@
- cd `dirname wmsmixer` && \
- $(LN) `basename wmsmixer.$(MANSRCSUFFIX)` `basename $@`
-
cleandir::
$(RM) wmsmixer.$(MANNEWSUFFIX) |
Big make files give me the willies so my modifications are the result of uneducated guess work and ruthless use of the delete key. Someone with a clue might want to produce a proper version and I guess a mwsmixer-0.5-r1. |
|