This is an automated email from the git hooks/post-receive script. jcowgill pushed a commit to branch master in repository glfw3.
commit 0754ea93adf67386ab0f68dfbebbfe181e0f5e1b Author: James Cowgill <[email protected]> Date: Sun Jun 26 23:45:52 2016 +0100 Only build wayland package on linux --- debian/control | 14 +++++++------- debian/rules | 9 ++++++--- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian/control b/debian/control index 46d0148..8ba4a22 100644 --- a/debian/control +++ b/debian/control @@ -9,18 +9,18 @@ Build-Depends: cmake, debhelper (>= 9), dh-exec, - extra-cmake-modules, - libegl1-mesa-dev, + extra-cmake-modules [linux-any], + libegl1-mesa-dev [linux-any], libgl1-mesa-dev | libgl-dev, - libwayland-dev, + libwayland-dev [linux-any], libx11-dev, libxcursor-dev, libxinerama-dev, libxkbcommon-dev, libxrandr-dev, libxxf86vm-dev, - pkg-config, - wayland-protocols, + pkg-config [linux-any], + wayland-protocols [linux-any], Build-Depends-Indep: doxygen Standards-Version: 3.9.8 Homepage: http://www.glfw.org/ @@ -49,7 +49,7 @@ Description: portable library for OpenGL, window and input (x11 libraries) Package: libglfw3-wayland Priority: extra -Architecture: any +Architecture: linux-any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} @@ -69,7 +69,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: - libglfw3 (= ${binary:Version}) | libglfw3-wayland (= ${binary:Version}), + libglfw3 (= ${binary:Version}) | libglfw3-wayland (= ${binary:Version}) [linux-any], libgl1-mesa-dev | libgl-dev, ${misc:Depends}, Recommends: diff --git a/debian/rules b/debian/rules index 12a82e9..47648e2 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,9 @@ CONFIGURE_COMMON = -DLIB_SUFFIX="/$(DEB_HOST_MULTIARCH)" \ -DBUILD_SHARED_LIBS=ON -DGLFW_BUILD_EXAMPLES=OFF \ -DGLFW_BUILD_TESTS=OFF +# When executed, this becomes true if wayland should be skipped +SKIP_WAYLAND := (! dh_listpackages | grep -q ^libglfw3-wayland$$) + %: dh $@ --parallel @@ -19,15 +22,15 @@ override_dh_auto_clean: override_dh_auto_configure: dh_auto_configure -Bbuild-x11 -- $(CONFIGURE_COMMON) -DGLFW_BUILD_DOCS=ON - dh_auto_configure -Bbuild-wayland -- $(CONFIGURE_COMMON) -DGLFW_USE_WAYLAND=ON + $(SKIP_WAYLAND) || dh_auto_configure -Bbuild-wayland -- $(CONFIGURE_COMMON) -DGLFW_USE_WAYLAND=ON override_dh_auto_build: dh_auto_build -Bbuild-x11 - dh_auto_build -Bbuild-wayland + $(SKIP_WAYLAND) || dh_auto_build -Bbuild-wayland override_dh_auto_install: dh_auto_install -Bbuild-x11 - dh_auto_install -Bbuild-wayland -- DESTDIR=$(CURDIR)/debian/tmp/wayland + $(SKIP_WAYLAND) || dh_auto_install -Bbuild-wayland -- DESTDIR=$(CURDIR)/debian/tmp/wayland override_dh_installexamples: dh_installexamples -XCMakeLists.txt -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/glfw3.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
