Improve the determination of pageSize in patchelf.cc. Patch by Mark H Weaver . --- patchelf/src/patchelf.cc.orig 1969-12-31 19:00:01.000000000 -0500 +++ patchelf/src/patchelf.cc 2014-02-16 20:15:06.283203125 -0500 @@ -21,11 +21,19 @@ using namespace std; -#ifdef MIPSEL -/* The lemote fuloong 2f kernel defconfig sets a page size of 16KB */ -const unsigned int pageSize = 4096*4; -#else +/* Note that some platforms support multiple page sizes. Therefore, + it is not enough to query the current page size. 'pageSize' must + be the maximum architectural page size for the platform, which is + typically defined in the corresponding ABI document. + + XXX FIXME: This won't work when we're cross-compiling. */ + +#if defined __MIPSEL__ || defined __MIPSEB__ || defined __aarch64__ +const unsigned int pageSize = 65536; +#elif defined __x86_64__ || defined __i386__ || defined __arm__ const unsigned int pageSize = 4096; +#else +# error maximum architectural page size unknown for this platform #endif --- patchelf/tests/no-rpath.sh.orig 2014-01-14 08:17:47.000000000 -0500 +++ patchelf/tests/no-rpath.sh 2015-01-06 18:31:53.418172797 -0500 @@ -1,23 +1,23 @@ #! /bin/sh -e SCRATCH=scratch/$(basename $0 .sh) -rm -rf ${SCRATCH} -mkdir -p ${SCRATCH} +if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then + rm -rf ${SCRATCH} + mkdir -p ${SCRATCH} -cp ${srcdir}/no-rpath ${SCRATCH}/ + cp ${srcdir}/no-rpath ${SCRATCH}/ -oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) -if test -n "$oldRPath"; then exit 1; fi -../src/patchelf \ - --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \ - --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath + oldRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) + if test -n "$oldRPath"; then exit 1; fi + ../src/patchelf \ + --set-interpreter "$(../src/patchelf --print-interpreter ../src/patchelf)" \ + --set-rpath /foo:/bar:/xxxxxxxxxxxxxxx ${SCRATCH}/no-rpath -newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) -if ! echo "$newRPath" | grep -q '/foo:/bar'; then - echo "incomplete RPATH" - exit 1 -fi + newRPath=$(../src/patchelf --print-rpath ${SCRATCH}/no-rpath) + if ! echo "$newRPath" | grep -q '/foo:/bar'; then + echo "incomplete RPATH" + exit 1 + fi -if [ "$(uname -m)" = i686 -a "$(uname -s)" = Linux ]; then cd ${SCRATCH} && ./no-rpath fi >AgeCommit message (Expand)Author 2020-11-18services: SDDM: Wait for elogind before starting....Fixes <https://bugs.gnu.org/44669>. * gnu/services/sddm.scm (sddm-shepherd-service)[requirement]: Add elogind. Marius Bakke 2020-04-19services: sddm: Have sddm provision xorg-server....* gnu/services/sddm.scm (sddm-shepherd-service)[shepherd-service]: Have sddm provision 'xorg-server like the other display managers. Efraim Flashner 2020-03-01services: set-xorg-configuration: handle slim and sddm...* gnu/services/xorg.scm (handle-xorg-configuration): New syntax. (gdm-service-type, slim-service-type): Use handle-xorg-configuration. * gnu/services/sddm.scm (sddm-service-type): Likewise. Jakub Kądziołka 2020-02-16doc: Fix typo....* doc/guix.texi (X Window)[sddm-service-type]: SSDM -> SDDM typo fix. [sddm-configuration]: Also list 'maya' theme. * gnu/services/sddm.scm (sddm-service): Fix typo in doc string. (sddm-configuration): Also list 'maya' theme. Efraim Flashner 2019-10-21services: sddm: Add description....* gnu/services/sddm.scm (sddm-service-type)[description]: New field. Ludovic Courtès 2019-10-21services: sddm: Deprecate 'sddm-service' procedure....* gnu/services/sddm.scm (sddm-service): Mark as deprecated. * doc/guix.texi (X Window): Document 'sddm-service-type' and 'sddm-configuration'. Ludovic Courtès 2019-10-21services: sddm: Add default configuration....Unlike gdm-service-type, sddm-service-type cannot be configured in an operating-system configuration by simply adding (service sddm-service-type). This adds the default SDDM configuration just like GDM does.. * gnu/services/sddm.scm (sddm-service-type)[default-value]: New field. Signed-off-by: Ludovic Courtès <ludo@gnu.org> Brendan Tildesley 2019-05-26services: sddm: Fix root login failure issue....* gnu/services/sddm.scm (sdm-pam-service): Set uid from CONFIG. (sdm-autologin-pam-service): Set uid from CONFIG. (sdm-pam-services): Pass CONFIG to 'sddm-pam-service' and 'sddm-autologin-pam-service'. * doc/guix.texi (X Window): Adjust 'minimum-uid' documentation. Co-authored-by: Ludovic Courtès <ludo@gnu.org> Reza Alizadeh Majd