Taken from https://bug1339931.bmoattachments.org/attachment.cgi?id=8837771. # HG changeset patch # Parent 4732a0e5d22bc7e5c1f1ace7a182d537d9cc2c6a Add major version to shell and js-config filenames. Author: Rico Tzschichholz Forwarded: no Last-Update: 2014-10-29 --- diff --git a/js/src/configure b/js/src/configure --- a/js/src/configure +++ b/js/src/configure @@ -1696,8 +1696,13 @@ MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` +if test -n "$JS_STANDALONE"; then +JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION +JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config +else JS_SHELL_NAME=js JS_CONFIG_NAME=js-config +fi if test -n "$IS_ALPHA"; then diff --git a/js/src/configure.in b/js/src/configure.in --- a/js/src/configure.in +++ b/js/src/configure.in @@ -234,16 +234,13 @@ MOZJS_MINOR_VERSION=`echo $MOZILLA_VERSI MOZJS_PATCH_VERSION=`echo $MOZILLA_VERSION | sed "s|^[0-9]*\.[0-9]*[^0-9]*||"` IS_ALPHA=`echo $MOZILLA_VERSION | grep '[ab]'` -dnl XXX in a temporary bid to avoid developer anger at renaming files -dnl XXX before "js" symlinks exist, don't change names. -dnl -dnl if test -n "$JS_STANDALONE"; then -dnl JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION -dnl JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config -dnl else +if test -n "$JS_STANDALONE"; then +JS_SHELL_NAME=js$MOZJS_MAJOR_VERSION +JS_CONFIG_NAME=js$MOZJS_MAJOR_VERSION-config +else JS_SHELL_NAME=js JS_CONFIG_NAME=js-config -dnl fi +fi changequote([,]) if test -n "$IS_ALPHA"; then diff -r 80a9e64d75f5 js/src/Makefile.in --- a/js/src/Makefile.in Wed Jun 25 15:11:42 2014 +0200 +++ b/js/src/Makefile.in Sat Jul 05 14:08:38 2014 +0200 @@ -273,6 +273,9 @@ SCRIPTS = $(JS_CONFIG_NAME) SDK_BINARY = $(JS_CONFIG_NAME) +$(JS_CONFIG_NAME): js-config + cp $^ $@ + $(JS_LIBRARY_NAME).pc: js.pc cp $^ $@ e='10' name='q' value=''/>
path: root/gnu/system/images
AgeCommit message (Expand)Author
2024-05-22system: images: Add visionfive2 module....* gnu/system/images/visionfive2.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Change-Id: I8831f1148bcddb0d604e1174034fca85cd2887a1 Zheng Junjie
2024-04-18system: Remove nss-certs from OS templates, adjust doc....This is a follow-up to commit 86afaadb51 ("system: Add 'nss-certs' to %base-packages-networking.") * doc/guix-cookbook.texi (Running Guix on a Linode Server): Remove nss-certs from operating system's packages field. (Running Guix on a Kimsufi Server): Likewise. * doc/guix.texi (Using the Configuration System): Likewise. (X.509 Certificates): Adjust to mention nss-certs *is* part of %base-packages. * gnu/installer/services.scm (%system-services): Remove recommendation to install nss-certs. * gnu/system/examples/bare-bones.tmpl (host-name): Remove obsolete comments. * gnu/system/examples/desktop.tmpl (packages): Remove nss-certs. * gnu/system/examples/lightweight-desktop.tmpl (packages): Likewise. * gnu/system/examples/plasma.tmpl (packages): Likewise. * gnu/system/examples/raspberry-pi-64-nfs-root.tmpl (packages): Likewise. * gnu/system/examples/raspberry-pi-64.tmpl (packages): Likewise. * gnu/system/examples/vm-image.tmpl (packages): Likewise. * gnu/system/images/orangepi-r1-plus-lts-rk3328.scm (packages): Likewise. * gnu/system/images/pine64.scm (packages): Likewise. * gnu/system/install.scm (installation-os) [packages]: Likewise. Change-Id: If09123a69b987178bcb0aab61c4570c14fc1286f Maxim Cournoyer
2023-12-22images: Add orangepi-r1-plus-lts image....* gnu/local.mk: Register image. * gnu/system/images/orangepi-r1-plus-lts-rk3328.scm: New file. * gnu/system/install.scm (orangepi-r1-plus-lts-rk3328-installation-os): New variable. Signed-off-by: Vagrant Cascadian <vagrant@debian.org> Herman Rimm
2023-06-14system: images: Add unmatched module....* gnu/system/images/unmatched.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. Efraim Flashner
2022-12-26images: wsl2: Create XDG_RUNTIME_DIR on first login....* gnu/system/images/wsl2.scm (wsl-boot-program): Create XDG_RUNTIME_DIR on first login and set it. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org> dan