While the X sources instruct you to install the JDS CBE to build X, they
make the mistake of not specifying which version - they should say 1.5.1
right now, as that's the version used in our builds, and in my tests of
the OpenSolaris builds.
JDS has recently released their CBE 1.6, including upgrading autoconf,
automake, and libtool to newer versions, and their engineers are working
on integrating these newer versions into SFW (see the sfwnv-discuss list
for info on that).
Unfortunately, the way our builds use these tools to regenerate the build
scripts and makefiles after patching them doesn't work with thew new versions,
mostly due to version mismatches with the existing files, but also due to a
couple actual incompatibilities where automake turned previous warnings into
fatal errors.
I've fixed this in our master tree, so future code drops should work with
either CBE 1.6 or the SFW integrations - for now, either stick with CBE 1.5.1
or apply the following set of changes (which are against the current state
of the tree, but should hopefully be not too far off the last code drop).
-alan-
Description:
Incorporate patches from Xorg head to fix automake-1.10 incompatibilities
Modify delibtoolize to match Makefile rules used by new versions of automake &
libtool.
Add autoreconf rule to Makefile.inc and use it to replace custom
autoconf/automake
rules in individual makefiles
Code Changes:
###############################################################################
# New file open-src/xserver/xorg/automake-1.10.patch
[Patches adjusted from originals in git to match current state of tree.]
commit 8deaaa312ad7f9b492a2ae8ad17d74650112c25c
Author: Bernhard Rosenkraenzer <bero at arklinux.org>
Date: Sat Nov 4 18:59:39 2006 +0200
automake: avoid use of reserved _SOURCES keyword (bug #8866)
Avoid using _SOURCES unless we're directly referencing a program or
library to be built; use _SRCS instead. Shuts automake 1.10 up.
diff --git a/hw/xfree86/os-support/linux/Makefile.am
b/hw/xfree86/os-support/linux/Makefile.am
index 9e09fb6..caf6007 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -12,12 +12,12 @@ PLATFORM_PCI_SUPPORT = lnx_ev56.c \
endif
if LNXACPI
-ACPI_SOURCES = lnx_acpi.c lnx_apm.c
+ACPI_SRCS = lnx_acpi.c lnx_apm.c
XORG_CFLAGS += -DHAVE_ACPI
endif
if LNXAPM
-APM_SOURCES = lnx_apm.c
+APM_SRCS = lnx_apm.c
XORG_CFLAGS += -DHAVE_APM
endif
@@ -32,8 +32,8 @@ liblinux_la_SOURCES = lnx_init.c lnx_vid
$(srcdir)/../shared/stdResource.c \
$(srcdir)/../shared/libc_wrapper.c \
$(srcdir)/../shared/at_scancode.c \
- $(ACPI_SOURCES) \
- $(APM_SOURCES) \
+ $(ACPI_SRCS) \
+ $(APM_SRCS) \
$(PLATFORM_PCI_SUPPORT)
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES)
@@ -39,12 +39,12 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC
INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this
last part is crack
# FIXME: These need to be added to the build
-LNX_EXTRA_SOURCES = \
+LNX_EXTRA_SRCS = \
lnx_font.c \
lnx_jstk.c \
lnxResource.c
EXTRA_DIST = \
- $(LNX_EXTRA_SOURCES) \
+ $(LNX_EXTRA_SRCS) \
lnx.h \
$(srcdir)/../shared/xf86Axp.h
diff --git a/hw/xfree86/os-support/misc/Makefile.am
b/hw/xfree86/os-support/misc/Makefile.am
index f546e1a..8bec350 100644
--- a/hw/xfree86/os-support/misc/Makefile.am
+++ b/hw/xfree86/os-support/misc/Makefile.am
@@ -1,18 +1,18 @@
# FIXME: Add the *.S files to build when applicable
-I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S
-OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c
+I386_SRCS = BUSmemcpy.S IODelay.S SlowBcopy.S
+OTHER_SRCS = BUSmemcpy.c IODelay.c SlowBcopy.c
-ARCH_SOURCES = $(OTHER_SOURCES)
+ARCH_SRCS = $(OTHER_SRCS)
# FIXME: Add to the build (NeedPortIO)
-PORTIO_SOURCES = PortIO.S
+PORTIO_SRCS = PortIO.S
# FIXME: Add to the build (if HasGcc || HasGcc2)
-ILHACK_SOURCES = xf86_IlHack.c
+ILHACK_SRCS = xf86_IlHack.c
noinst_LTLIBRARIES = libmisc.la
-libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES)
+libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SRCS)
#AM_LDFLAGS = -r
@@ -20,4 +20,4 @@ INCLUDES = $(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS)
-EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)
+EXTRA_DIST = $(I386_SRCS) $(PORTIO_SRCS) $(ILHACK_SRCS)
diff --git a/os/Makefile.am b/os/Makefile.am
index dcfe80a..7381797 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -3,14 +3,14 @@ noinst_LTLIBRARIES = libos.la libcwrappe
AM_CFLAGS = $(DIX_CFLAGS)
# FIXME: Add support for these in configure.ac
-K5AUTH_SOURCES = k5auth.c
-SECURERPC_SOURCES = rpcauth.c
-INTERNALMALLOC_SOURCES = xalloc.c
+K5AUTH_SRCS = k5auth.c
+SECURERPC_SRCS = rpcauth.c
+INTERNALMALLOC_SRCS = xalloc.c
-XCSECURITY_SOURCES = secauth.c
-XDMCP_SOURCES = xdmcp.c
-STRLCAT_SOURCES = strlcat.c strlcpy.c
-XORG_SOURCES = log.c
+XCSECURITY_SRCS = secauth.c
+XDMCP_SRCS = xdmcp.c
+STRLCAT_SRCS = strlcat.c strlcpy.c
+XORG_SRCS = log.c
libos_la_SOURCES = \
WaitFor.c \
@@ -27,18 +27,18 @@ libos_la_SOURCES = \
xdmauth.c \
xstrans.c \
xprintf.c \
- $(XORG_SOURCES)
+ $(XORG_SRCS)
if XCSECURITY
-libos_la_SOURCES += $(XCSECURITY_SOURCES)
+libos_la_SOURCES += $(XCSECURITY_SRCS)
endif
if XDMCP
-libos_la_SOURCES += $(XDMCP_SOURCES)
+libos_la_SOURCES += $(XDMCP_SRCS)
endif
if NEED_STRLCAT
-libos_la_SOURCES += $(STRLCAT_SOURCES)
+libos_la_SOURCES += $(STRLCAT_SRCS)
endif
libcwrapper_la_SOURCES = \
@@ -48,8 +48,8 @@ libcwrapper_la_CFLAGS = \
-I$(top_srcdir)/hw/xfree86/os-support \
$(AM_CFLAGS)
-EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \
- $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(STRLCAT_SOURCES)
+EXTRA_DIST = $(K5AUTH_SRCS) $(SECURERPC_SRCS) $(INTERNALMALLOC_SRCS) \
+ $(XCSECURITY_SRCS) $(XDMCP_SRCS) $(STRLCAT_SRCS)
if XSERVER_DTRACE
# Generate dtrace object code for probes in libos & libdix
commit 9fcb30ebf7b7b2137955f759e95c1d58c4f27a11
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date: Thu Jul 12 13:00:32 2007 -0700
Make SOLARIS_INOUT_ARCH substitutions work better with automake-1.10
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 50aa673..cef6b5b 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -78,10 +78,10 @@ if SOLARIS_ASM_INLINE
# Needs to be built before any files are compiled when using Sun compilers
# so in*/out* inline definitions are properly processed.
-BUILT_SOURCES += os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il
+BUILT_SOURCES += os-support/solaris/solaris- at [email protected]
-os-support/solaris/solaris-$(SOLARIS_INOUT_ARCH).il:
- cd os-support/solaris ; make solaris-$(SOLARIS_INOUT_ARCH).il
+os-support/solaris/solaris- at [email protected]:
+ cd os-support/solaris ; make solaris- at [email protected]
endif
# do not use $(mkdir_p) if you want automake 1.7 to work
diff --git a/hw/xfree86/os-support/solaris/Makefile.am
b/hw/xfree86/os-support/solaris/Makefile.am
index d01e2e6..c027d9a 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -11,11 +11,11 @@ #else
#AGP_SRC = $(srcdir)/../shared/agp_noop.c
#endif
-SOLARIS_INOUT_SRC = solaris-$(SOLARIS_INOUT_ARCH).S
-DISTCLEANFILES = solaris-$(SOLARIS_INOUT_ARCH).il
+SOLARIS_INOUT_SRC = solaris- at [email protected]
+DISTCLEANFILES = solaris- at [email protected]
-solaris-$(SOLARIS_INOUT_ARCH).il: solaris-${SOLARIS_INOUT_ARCH}.S
- $(CPP) -P -DINLINE_ASM solaris-${SOLARIS_INOUT_ARCH}.S > $@
+solaris- at [email protected]: solaris- at [email protected]
+ $(CPP) -P -DINLINE_ASM solaris- at [email protected] > $@
noinst_LTLIBRARIES = libsolaris.la
libsolaris_la_SOURCES = sun_bios.c sun_init.c \
@@ -28,7 +28,7 @@ libsolaris_la_SOURCES = sun_bios.c sun_i
nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
sdk_HEADERS = agpgart.h
-nodist_sdk_HEADERS = solaris-$(SOLARIS_INOUT_ARCH).il
+nodist_sdk_HEADERS = solaris- at [email protected]
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
###############################################################################
--- XW_NV_MWS/open-src/common/Makefile.inc 2007-05-15 16:55:50.576667000
-0700
+++ alanc/open-src/common/Makefile.inc 2007-07-20 16:08:52.152630000 -0700
@@ -28,7 +28,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile.inc 1.76 07/05/15
+# %W% %E%
#
# Borrowed from Solaris OS/Net makefile.master:
@@ -154,6 +154,7 @@
X11_INCLUDES_DIR=$(X11_DIR)/include
X11_DOC_DIR=$(X11_DIR)/share/doc
X11_LOCALE_DIR=$(X11_DIR)/share/locale
+X11_ACLOCAL_DIR=$(X11_DIR)/share/aclocal
X11_LC_MESSAGES_DIR=$(X11_LOCALE_DIR)/C/LC_MESSAGES
# Subdirectory of /usr/X11/lib for X server private libraries
X11_SERVERLIBS_SUBDIR=/X11/xserver
@@ -230,7 +231,8 @@
source_gen::
mkdir -p $(BUILD_DIR)
- @if [ "x$(SOURCE_TARBALL_NAME)" != "xNONE" ] ; then \
+ @case '$(MFLAGS)' in *[ik]*) set +e;; esac; \
+ if [ "x$(SOURCE_TARBALL_NAME)" != "xNONE" ] ; then \
if [ "x$(SOURCE_UNCOMPRESS)" = "x" ] ; then \
echo "bzcat $(SOURCE_TARBALL) | (cd $(BUILD_DIR) ; tar -xf - )"
; \
( bzcat $(SOURCE_TARBALL) | (cd $(BUILD_DIR) ; tar -xf - )) ; \
@@ -238,8 +240,8 @@
echo "$(SOURCE_UNCOMPRESS) $(SOURCE_TARBALL) | (cd $(BUILD_DIR)
; tar
-xf - )" ; \
( $(SOURCE_UNCOMPRESS) $(SOURCE_TARBALL) | (cd $(BUILD_DIR) ;
tar -xf
- )) ; \
fi ; \
- fi
- @if [ "x$(SOURCE_PATCHES)" != "x" ] ; then \
+ fi ; \
+ if [ "x$(SOURCE_PATCHES)" != "x" ] ; then \
for p in $(SOURCE_PATCHES) x ; do \
if [ "$$p" != "x" ] ; then \
PATCH_CMD=`echo $$p | awk -F, '{if (NF > 1) FLAGS = $$2;
else FLAGS="-p0"
; printf "gpatch -d $(SOURCE_DIR) %s < %s\n", FLAGS, $$1}'` ; \
@@ -247,15 +249,15 @@
eval $${PATCH_CMD} ; \
fi ; \
done ; \
- fi
- @if [ "x$(SUNTOUCHED_MANPAGES)" != "x" ] ; then \
+ fi ; \
+ if [ "x$(SUNTOUCHED_MANPAGES)" != "x" ] ; then \
echo "/usr/perl5/bin/perl $(TOP)/common/suntouch-manpages.pl \
$(SUNTOUCH_MAN_FLAGS) $(SUNTOUCHED_MANPAGES)" ; \
(cd $(SOURCE_DIR) && \
/usr/perl5/bin/perl $(TOP)/common/suntouch-manpages.pl \
$(SUNTOUCH_MAN_FLAGS) $(SUNTOUCHED_MANPAGES) ) ; \
- fi
- @if [ "x$(FIX_PC_FILES)" != "x" ] ; then \
+ fi ; \
+ if [ "x$(FIX_PC_FILES)" != "x" ] ; then \
echo "/usr/perl5/bin/perl -i.orig -p \
$(FIX_PC_OPS) $(FIX_PC_FILES)" ; \
(cd $(SOURCE_DIR) && \
@@ -264,6 +266,14 @@
fi
touch $(BUILD_DIR)/.unpack_done
+### Regenerate autoconf/automake/libtools files after patching when needed
+
+# Include Xorg autoconf macros when rebuilding configure scripts
+ACLOCAL_PATH=aclocal -I $(PROTODIR)/usr/X11/share/aclocal
+
+autoreconf: $(UNPACK_TARGET)
+ (cd $(SOURCE_DIR) && \
+ ACLOCAL="$(ACLOCAL_PATH)" autoreconf -v --install --force )
### Source tarballs & downloading if necessary
@@ -279,7 +289,7 @@
$(SOURCE_URL_DEFAULT)
SOURCE_URL=$(XORG_RELEASES_URL)/$(SOURCE_TARBALL_DIR)/$(SOURCE_TARBALL_NAME)
download:
- if [ ! -f $(SOURCE_TARBALL) ] ; then \
+ if [ ! -s $(SOURCE_TARBALL) ] ; then \
$(WGET) -O $(SOURCE_TARBALL) $(SOURCE_URL) ;\
fi
###############################################################################
--- XW_NV_MWS/open-src/common/delibtoolize.pl 2007-02-03 11:02:29.263562000
-0800
+++ alanc/open-src/common/delibtoolize.pl 2007-07-23 15:02:52.805610000
-0700
@@ -3,7 +3,7 @@
# Copyright 2007 Sun Microsystems, Inc. All rights reserved.
# Use is subject to license terms.
#
-# ident "@(#)delibtoolize.pl 1.5 07/02/03 SMI"
+# ident "%Z%%M% %I% %E% SMI"
#
#
@@ -62,23 +62,37 @@
my $curtarget = "";
- foreach $l (@inlines) {
+ my $l = "";
+
+ foreach my $curline (@inlines) {
+ $l .= $curline;
+ next if ($curline =~ m/\\$/);
+
# Remove libtool script from compile steps &
# add PIC flags that libtool normally provides
- $l =~ s%\$\(LIBTOOL\)( --tag=CC)? --mode=compile\s*(\$\(CC\))%$2
$picflags%;
- $l =~ s%\$\(LIBTOOL\)( --tag=CC)? --mode=compile\s*(\$\(CCAS\))%$2
$picflags%;
+ $l =~ s{\$\(LIBTOOL\)
+ (?:[\\\s]+ --tag=CC)?
+ (?:[\\\s]+ \$\(AM_LIBTOOLFLAGS\) [\\\s]+ \$\(LIBTOOLFLAGS\))?
+ [\\\s]+ --mode=compile
+ [\\\s]+ (\$\(CC\)|\$\(CCAS\))
+ }{$1 $picflags}xs;
# Remove libtool script from link step
- $l =~ s%\$\(LIBTOOL\)( --tag=CC)? --mode=link\s*%%;
+ $l =~ s{\$\(LIBTOOL\)
+ (?:[\\\s]+ --tag=CC)?
+ (?:[\\\s]+ \$\(AM_LIBTOOLFLAGS\) [\\\s]+ \$\(LIBTOOLFLAGS\))?
+ [\\\s]+ --mode=link
+ }{}xs;
# Change -rpath to -R in link arguments
- $l =~ s%(\s*)-rpath(\s*)%$1-R$2%g;
+ $l =~ s{(\s*)-rpath(\s*)}{$1-R$2}g;
# Change flags for building shared object from arguments to libtool
# script into arguments to linker
- $l =~ s%(_la_LDFLAGS\s*=.*) -module%$1 $sharedobjflags%;
- $l =~ s%(_la_LDFLAGS\s*=.*) -version-number (\d+)[:\d]+%$1
$sharedobjflags%;
- $l =~ s%(_la_LDFLAGS\s*=.*) -no-undefined%$1 -z defs%;
+ $l =~ s{(_la_LDFLAGS\s*=.*) -module}{$1 $sharedobjflags};
+ $l =~ s{(_la_LDFLAGS\s*=.*) -version-number (\d+)[:\d]+}
+ {$1 $sharedobjflags};
+ $l =~ s{(_la_LDFLAGS\s*=.*) -no-undefined}{$1 -z defs};
# Change file names
my $so;
@@ -102,6 +116,7 @@
}
print NEW $l;
+ $l = "";
}
close(NEW) or die;
}
###############################################################################
--- XW_NV_MWS/open-src/driver/xf86-video-ati/Makefile 2007-06-18
13:12:50.118822000 -0700
+++ alanc/open-src/driver/xf86-video-ati/Makefile 2007-07-20
16:09:15.511175000
-0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.11 07/06/13
+# %W% %E%
#
# Package name used in tarballs
@@ -71,8 +71,7 @@
include ../Makefile.inc
-source_gen:: $(UNPACK_TARGET)
- (cd $(SOURCE_DIR) && automake && autoconf)
+source_gen:: autoreconf
install_gen::
mkdir -p $(PROTODIR)$(X11_DOC_DIR)
###############################################################################
--- XW_NV_MWS/open-src/driver/xf86-video-cirrus/Makefile 2007-01-31
16:31:57.568297000 -0800
+++ alanc/open-src/driver/xf86-video-cirrus/Makefile 2007-07-24
16:14:34.820870000 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# %W% %E%
#
# Package name used in tarballs
@@ -55,5 +55,5 @@
include ../Makefile.inc
-source_gen:: $(UNPACK_TARGET)
- (cd $(SOURCE_DIR) && automake)
+source_gen:: $(UNPACK_TARGET) autoreconf
+
###############################################################################
--- XW_NV_MWS/open-src/driver/xf86-video-i810/Makefile 2007-06-06
18:13:42.839145000 -0700
+++ alanc/open-src/driver/xf86-video-i810/Makefile 2007-07-24
16:17:51.360393000
-0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.9 07/06/01
+# %W% %E%
#
# Package name used in tarballs
@@ -62,8 +62,7 @@
include ../Makefile.inc
-source_gen:: $(UNPACK_TARGET)
- (cd $(SOURCE_DIR) && automake && autoconf)
+source_gen:: $(UNPACK_TARGET) autoreconf
install_gen::
mkdir -p $(PROTODIR)$(X11_DOC_DIR)
###############################################################################
--- XW_NV_MWS/open-src/driver/xf86-video-mga/Makefile 2007-02-26
18:38:20.211401000 -0800
+++ alanc/open-src/driver/xf86-video-mga/Makefile 2007-07-24
16:53:44.470821000
-0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.7 07/02/26
+# %W% %E%
#
# Package name used in tarballs
@@ -60,5 +60,5 @@
include ../Makefile.inc
-source_gen::
- (cd $(SOURCE_DIR) && automake)
+source_gen:: $(UNPACK_TARGET) autoreconf
+
###############################################################################
--- XW_NV_MWS/open-src/driver/xf86-video-trident/Makefile 2007-01-31
16:32:00.079106000 -0800
+++ alanc/open-src/driver/xf86-video-trident/Makefile 2007-07-24
16:56:55.532946000 -0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.4 07/01/31
+# %W% %E%
#
# Package name used in tarballs
@@ -58,5 +58,5 @@
include ../Makefile.inc
-source_gen::
- (cd $(SOURCE_DIR) && automake)
+source_gen:: $(UNPACK_TARGET) autoreconf
+
###############################################################################
--- XW_NV_MWS/open-src/xserver/xorg/Makefile 2007-07-12 17:30:57.966160000
-0700
+++ alanc/open-src/xserver/xorg/Makefile 2007-07-20 15:28:19.682686000
-0700
@@ -30,7 +30,7 @@
# or other dealings in this Software without prior written authorization
# of the copyright holder.
#
-# @(#)Makefile 1.49 07/07/13
+# %W% %E%
#
PWD:sh=pwd
@@ -58,6 +58,7 @@
immu.h.patch,-p1 \
server-libs.patch \
dtrace.patch \
+ automake-1.10.patch,-p1 \
client-privates-leak.patch,-p1 \
ddc.patch,-p1 \
xcmisc-security.patch \
@@ -213,12 +214,10 @@
BUILD_64_FLAGS_i386=ARCH_GCC_FLAGS="$(ARCH64_GCC_FLAGS)"
ARCHBINSUBDIR="$(SUBDIR64)"
BUILD_64_FLAGS=$(BUILD_64_FLAGS_$(MACH))
-ACLOCAL_PATH=aclocal -I $(PROTODIR)/usr/X11/share/aclocal
-
# Run configure script
-$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET)
- (cd $(SOURCE_DIR) && ACLOCAL="$(ACLOCAL_PATH)" autoreconf \
- && $(CONFIG_ENV) ./configure $(CONFIG_OPTS) )
+$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET) autoreconf
+ (cd $(SOURCE_DIR) && \
+ $(CONFIG_ENV) ./configure $(CONFIG_OPTS) )
(cd $(SOURCE_DIR)/hw/xfree86/xf1bpp && \
$(MAKE) $(MFLAGS) maintainer-clean-generic)
###############################################################################
--- XW_NV_MWS/open-src/xserver/xorg/dtlogin-userinfo.patch 2007-01-31
16:32:16.671187000 -0800
+++ alanc/open-src/xserver/xorg/dtlogin-userinfo.patch 2007-07-20
15:32:54.696390000 -0700
@@ -45,7 +45,7 @@
xstrans.c \
xprintf.c \
+ dtlogin.c \
- $(XORG_SOURCES)
+ $(XORG_SRCS)
if XCSECURITY
@@ -41,6 +42,8 @@ if NEED_STRLCAT
##############################################################################
diff open-src/app/xpm/Makefile:1.5 open-src/app/xpm/Makefile:1.6
--- open-src/app/xpm/Makefile 2007-07-25 13:06:03.295459163 -0700
+++ open-src/app/xpm/Makefile 2007-07-25 13:06:03.298262724 -0700
@@ -76,10 +76,8 @@
PKG_CONFIG_PATH=$(PROTODIR)/usr/lib/$(ARCHLIBSUBDIR)/pkgconfig:$(TOP)/common/pc-files/$(BUILD_DIR)
# Run configure script
-$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET)
- (cd $(SOURCE_DIR) ; cat acinclude.m4 >> aclocal.m4 ; \
- automake && autoconf && \
- $(CONFIG_ENV) ./configure $(CONFIG_OPTS) )
+$(SOURCE_DIR)/Makefile: $(UNPACK_TARGET) autoreconf
+ (cd $(SOURCE_DIR) && $(CONFIG_ENV) ./configure $(CONFIG_OPTS) )
# Binary built in tree
APP_BIN=$(SOURCE_DIR)/cxpm/cxpm $(SOURCE_DIR)/sxpm/sxpm
