diff options
| author | gallatin <gallatin@FreeBSD.org> | 2002-03-19 22:24:07 +0800 |
|---|---|---|
| committer | gallatin <gallatin@FreeBSD.org> | 2002-03-19 22:24:07 +0800 |
| commit | 07ead3742ccc0f522cb4f8eb478fdb457321e670 (patch) | |
| tree | 60d430f2953be9f9664a2bfaea4f07549998a325 /x11-servers | |
| parent | 8073def9a789ed39cc2637ade699943a4c2b433b (diff) | |
| download | freebsd-ports-gnome-07ead3742ccc0f522cb4f8eb478fdb457321e670.tar.gz freebsd-ports-gnome-07ead3742ccc0f522cb4f8eb478fdb457321e670.tar.zst freebsd-ports-gnome-07ead3742ccc0f522cb4f8eb478fdb457321e670.zip | |
Tweaks to get this compiling on alpha:
- Disable the building of DRI (as it only works on x86)
- Ensure that HaveMatroxHal is defined to a valid value when DRI is not
built, otherwise imake complains about a syntax error when it encounters
HaveMatroxHal in the mga driver Imakefile
reviewed by: will
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/Makefile | 8 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/Makefile b/x11-servers/XFree86-4-Server-snap/Makefile index b1a976482624..2b1a0e60db34 100644 --- a/x11-servers/XFree86-4-Server-snap/Makefile +++ b/x11-servers/XFree86-4-Server-snap/Makefile @@ -90,14 +90,18 @@ HasXdmAuth?= YES HasSecureRPC?= DEFAULT HasPam?= DEFAULT ExtendedInputDevices?= DEFAULT -.if (exists(/sys) || exists(/usr/src/sys)) +.if ${ARCH} == i386 && (exists(/sys) || exists(/usr/src/sys)) BuildXF86DRI= YES BuildXF86DRM= YES PLIST_SUB+= DRI="" PLIST_SUB+= DRI_KMOD="" .else pre-fetch:: +.if ${ARCH} == i386 @${ECHO_MSG} "DRI would not build: kernel source required in /sys." +.else + @${ECHO_MSG} "DRI only built on i386" +.endif # i386 BuildXF86DRI= NO BuildXF86DRM= NO PLIST_SUB+= DRI="@comment " @@ -178,6 +182,8 @@ post-patch:: post-install:: ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README_HALLIB ${PREFIX}/lib/X11/doc/README.mga_HALLIB .endif # !WITH_MATROX_GXX_DRIVER +.else +HaveMatroxHal= NO .endif do-configure: diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index b1a976482624..2b1a0e60db34 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -90,14 +90,18 @@ HasXdmAuth?= YES HasSecureRPC?= DEFAULT HasPam?= DEFAULT ExtendedInputDevices?= DEFAULT -.if (exists(/sys) || exists(/usr/src/sys)) +.if ${ARCH} == i386 && (exists(/sys) || exists(/usr/src/sys)) BuildXF86DRI= YES BuildXF86DRM= YES PLIST_SUB+= DRI="" PLIST_SUB+= DRI_KMOD="" .else pre-fetch:: +.if ${ARCH} == i386 @${ECHO_MSG} "DRI would not build: kernel source required in /sys." +.else + @${ECHO_MSG} "DRI only built on i386" +.endif # i386 BuildXF86DRI= NO BuildXF86DRM= NO PLIST_SUB+= DRI="@comment " @@ -178,6 +182,8 @@ post-patch:: post-install:: ${INSTALL_DATA} ${WRKSRC}/programs/Xserver/hw/xfree86/drivers/mga/README_HALLIB ${PREFIX}/lib/X11/doc/README.mga_HALLIB .endif # !WITH_MATROX_GXX_DRIVER +.else +HaveMatroxHal= NO .endif do-configure: |