cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add local patch to fix alpha build. [1]

Browse Source 
- Add local patch to fix powerpc build. [2][3]
- Fix OPTIONS handling for SUID option. [4]

PR:		ports/113601 [1], ports/118850 [2],
		ports/118851 [3], ports/119012 [4]
Submitted by:	naddy [1], grehan [2][3],
		Dmitry Marakasov [4]
This commit is contained in:
Florent Thoumie 2008-01-02 12:58:05 +00:00
parent f94de7fbd6
commit ff3675ba98
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=204842
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11-servers/xorg-server/Makefile
View File

@ -71,7 +71,7 @@ CONFIGURE_ARGS+= --enable-aiglx=yes
CONFIGURE_ARGS+= --enable-aiglx=no
.endif
.if !defined(WITHOUT_SUID) || !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
CONFIGURE_ARGS+=--enable-install-setuid=yes
.else
CONFIGURE_ARGS+=--enable-install-setuid=no
@ -79,6 +79,7 @@ CONFIGURE_ARGS+=--enable-install-setuid=no
.if ${ARCH} == alpha
PLIST_SUB+= ALPHA_NA="@comment "
EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-alpha
.else
PLIST_SUB+= ALPHA_NA=""
.endif
@ -86,6 +87,7 @@ PLIST_SUB+= ALPHA_NA=""
.if ${ARCH} == powerpc
PLIST_SUB+= PPC_NA="@comment "
MAN4+= nv.4x
EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-powerpc
.else
PLIST_SUB+= PPC_NA=""
.endif
@ -105,7 +107,7 @@ MAN1+= scanpci.1
PLIST_SUB+= AMD64_I386_SPARC64="@comment "
.endif
.if !defined(WITHOUT_SUID) || !defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO
.if !defined(WITHOUT_SUID) && (!defined(NO_SUID_XSERVER) || ${NO_SUID_XSERVER} == NO)
pre-everything::
@${ECHO_MSG} "By default, the X Server installs as a set-user-id root binary. When run by"
@${ECHO_MSG} "a normal user, it checks arguments and environment as done in the x11/wrapper"

11
x11-servers/xorg-server/files/extra-arch-alpha Normal file
View File

@ -0,0 +1,11 @@
--- configure.orig 2008-01-02 12:40:11.000000000 +0000
+++ configure 2008-01-02 12:41:09.000000000 +0000
@@ -32222,7 +32222,7 @@
if test "x$XORG" = xyes -o "x$XGL" = xyes; then
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common'
- XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os'
+ XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/hw/xfree86/os-support/shared -I$(top_srcdir)/os'
XORG_INCS="$XORG_DDXINCS $XORG_OSINCS"
XORG_CFLAGS="$XORGSERVER_CFLAGS -DHAVE_XORG_CONFIG_H"
XORG_LIBS="$COMPOSITE_LIB $MI_LIB $FIXES_LIB $XEXTXORG_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XPSTUBS_LIB $OS_LIB"

25
x11-servers/xorg-server/files/extra-arch-powerpc Normal file
View File

@ -0,0 +1,25 @@
--- hw/xfree86/os-support/bsd/ppc_video.c.orig 2008-01-02 12:29:21.000000000 +0000
+++ hw/xfree86/os-support/bsd/ppc_video.c 2008-01-02 12:29:00.000000000 +0000
@@ -164,7 +164,11 @@
if (ioBase != MAP_FAILED)
{
+#if defined(__FreeBSD__)
+ munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
+#else
munmap(__UNVOLATILE(ioBase), 0x10000);
+#endif
ioBase = MAP_FAILED;
}
}
--- hw/xfree86/int10/Makefile.in.orig 2008-01-02 12:30:05.000000000 +0000
+++ hw/xfree86/int10/Makefile.in 2008-01-02 12:30:46.000000000 +0000
@@ -400,7 +400,7 @@
@INT10_VM86_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
@INT10_X86EMU_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
@INT10_X86EMU_TRUE@ $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS)
-
+@INT10_STUB_TRUE@INCLUDES = $(XORG_INCS)
@INT10_VM86_TRUE@INCLUDES = $(XORG_INCS)
@INT10_X86EMU_TRUE@INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
@INT10_STUB_TRUE@libint10_la_SOURCES = stub.c xf86int10module.c