diff options
| -rw-r--r-- | configs/debian-swx11+glu-static-amd64 | 10 | ||||
| -rw-r--r-- | configs/debian-swx11+glu-static-any (renamed from configs/debian-swx11+glu-static) | 5 | ||||
| -rw-r--r-- | configs/debian-swx11+glu-static-i386 | 10 | ||||
| -rw-r--r-- | configs/debian-swx11+glu-static-ppc64 | 11 | ||||
| -rwxr-xr-x | debian/rules | 19 |
5 files changed, 43 insertions, 12 deletions
diff --git a/configs/debian-swx11+glu-static-amd64 b/configs/debian-swx11+glu-static-amd64 new file mode 100644 index 00000000000..2976fbe66f3 --- /dev/null +++ b/configs/debian-swx11+glu-static-amd64 @@ -0,0 +1,10 @@ +# Configuration for building static versions of the libraries (swx11 and GLU) +# on amd64. + +include $(TOP)/configs/linux-x86-64-static +include $(TOP)/configs/debian-swx11+glu-default + +CONFIG_NAME = debian-swx11+glu-static-amd64 + +# vim: ft=make + diff --git a/configs/debian-swx11+glu-static b/configs/debian-swx11+glu-static-any index a819311d4b4..82f794d28df 100644 --- a/configs/debian-swx11+glu-static +++ b/configs/debian-swx11+glu-static-any @@ -1,9 +1,10 @@ -# Configuration for building static versions of the libraries (swx11 and GLU). +# Configuration for building static versions of the libraries (swx11 and GLU) +# on the build architecture. include $(TOP)/configs/linux-static include $(TOP)/configs/debian-swx11+glu-default -CONFIG_NAME = debian-swx11+glu-static +CONFIG_NAME = debian-swx11+glu-static-any # vim: ft=make diff --git a/configs/debian-swx11+glu-static-i386 b/configs/debian-swx11+glu-static-i386 new file mode 100644 index 00000000000..62859e42548 --- /dev/null +++ b/configs/debian-swx11+glu-static-i386 @@ -0,0 +1,10 @@ +# Configuration for building static versions of the libraries (swx11 and GLU) +# on i386. + +include $(TOP)/configs/linux-x86-static +include $(TOP)/configs/debian-swx11+glu-default + +CONFIG_NAME = debian-swx11+glu-static-i386 + +# vim: ft=make + diff --git a/configs/debian-swx11+glu-static-ppc64 b/configs/debian-swx11+glu-static-ppc64 new file mode 100644 index 00000000000..a9ea4a95b31 --- /dev/null +++ b/configs/debian-swx11+glu-static-ppc64 @@ -0,0 +1,11 @@ +# Configuration for building static versions of the libraries (swx11 and GLU) +# on ppc64. + +include $(TOP)/configs/debian-swx11+glu-static-any + +CONFIG_NAME = debian-swx11+glu-static-ppc64 + +LIB_DIR = lib64 + +# vim: ft=make + diff --git a/debian/rules b/debian/rules index 342cd1316e9..02ecb099edc 100755 --- a/debian/rules +++ b/debian/rules @@ -26,19 +26,22 @@ DEB_BUILD_DIR ?= $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) export DEB_BUILD_ARCH -# choose an architecture-specific configuration for building swx11 and GLU if -# one exists +# choose an architecture-specific build of swx11 and GLU if a matching +# configuration exists ifneq ($(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)),) SWX11_GLU_CONFIGS := debian-swx11+glu-$(DEB_BUILD_ARCH) else SWX11_GLU_CONFIGS := debian-swx11+glu-any endif -# build a static version of swx11 and GLU as well -SWX11_GLU_CONFIGS += debian-swx11+glu-static +# same for static builds +ifneq ($(wildcard configs/debian-swx11+glu-static-$(DEB_BUILD_ARCH)),) + SWX11_GLU_CONFIGS += debian-swx11+glu-static-$(DEB_BUILD_ARCH) +else + SWX11_GLU_CONFIGS += debian-swx11+glu-static-any +endif -# choose an architecture-specific configuration for building the DRI-enabled -# libGL if one exists +# and for the GLX/DRI-enabled libGL ifneq ($(wildcard configs/debian-dri-$(DEB_BUILD_ARCH)),) DRI_CONFIGS := debian-dri-$(DEB_BUILD_ARCH) else @@ -64,10 +67,6 @@ endif # SWX11_GLU_CONFIGS += debian-swx11+glu-sparc-ultrasparc #endif -# Use the following to automatically build all optimized configurations -# available for the build architecture. Use with caution =) -#SWX11_GLU_CONFIGS += $(subst configs/,,$(wildcard configs/debian-swx11+glu-$(DEB_BUILD_ARCH)-*)) - # build the following configurations by default CONFIGS = $(SWX11_GLU_CONFIGS) \ $(DRI_CONFIGS) \ |