[r-cran-yaml] 01/01: cosmetics
Joost van Baal
joostvb at moszumanska.debian.org
Thu Jan 7 17:25:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
joostvb pushed a commit to branch master
in repository r-cran-yaml.
commit 39e519bb6f0a240c9020504bcde8ec69adf51b00
Author: Joost van Baal-Ilić <joostvb at nusku.mdcc.cx>
Date: Thu Jan 7 18:25:36 2016 +0100
cosmetics
---
debian/changelog | 64 ++------------------------------------------------------
debian/rules | 17 ++++++++++++++-
2 files changed, 18 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ab1915f..4eba42c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -94,89 +94,29 @@ r-cran-yaml (2.1.13-3) unstable; urgency=low
/** @} */
-------------------
-
- our r-ext.h has:
-
- #include "yaml.h"
- #include "yaml_private.h"
-
- should be
-
- #include <yaml.h>
-
- and, i guess
-
- #include "yaml_private.h"
-
- since libyaml-dev ships only /usr/include/yaml.h
-
-
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% ls
- api.c emitter.c loader.c parser.c r-ext.c scanner.c yaml.h
- dumper.c implicit.c Makevars reader.c r-ext.h writer.c yaml_private.h
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% rm api.c dumper.c emitter.c loader.c parser.c reader.c scanner.c writer.c
-
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% rm yaml.h
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% ls
- implicit.c Makevars r-ext.c r-ext.h yaml_private.h
-
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% vi r-ext.h
-
- (sid)joostvb at nusku:~/git/r-cran/r-cran-yaml-2.1.13% fakeroot ./debian/rules binary
-
- MAKEFLAGS="LDFLAGS=-Wl,-z,relro" R CMD INSTALL -l /home/joostvb/git/r-cran/r-cran-yaml-2.1.13/debian/r-cran-yaml/usr/lib/R/site-library \
- --clean . \
- "--built-timestamp=\"Tue, 22 Dec 2015 13:35:23 +0100\"" \
- ; \
- fi
+
* installing *source* package ‘yaml’ ...
files ‘src/api.c’, ‘src/dumper.c’, ‘src/emitter.c’, ‘src/loader.c’, ‘src/parser.c’, ‘src/reader.c’, ‘src/scanner.c’, ‘src/writer.c’, ‘src/yaml.h’ are missing
file ‘src/r-ext.h’ has the wrong MD5 checksum
** libs
- make[1]: Entering directory '/home/joostvb/git/r-cran/r-cran-yaml-2.1.13/src'
- gcc -std=gnu99 -I/usr/share/R/include -DNDEBUG -I. -DNDEBUG -fpic -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -g -c implicit.c -o implicit.o
- gcc -std=gnu99 -I/usr/share/R/include -DNDEBUG -I. -DNDEBUG -fpic -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -g -c r-ext.c -o r-ext.o
- gcc -std=gnu99 -shared -L/usr/lib/R/lib -Wl,-z,relro -o yaml.so implicit.o r-ext.o -L/usr/lib/R/lib -lR
-
....
-
** testing if installed package can be loaded
Error in dyn.load(file, DLLpath = DLLpath, ...) :
unable to load shared object '/home/joostvb/git/r-cran/r-cran-yaml-2.1.13/debian/r-cran-yaml/usr/lib/R/site-library/yaml/libs/yaml.so':
/home/joostvb/git/r-cran/r-cran-yaml-2.1.13/debian/r-cran-yaml/usr/lib/R/site-library/yaml/libs/yaml.so: undefined symbol: yaml_sequence_start_event_initialize
Error: loading failed
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% gcc -std=gnu99 -I/usr/share/R/include -I. -fpic -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -g -c implicit.c -o implicit.o
- (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% ls
- implicit.c implicit.o Makevars r-ext.c r-ext.h yaml_private.h
+ (sid)joostvb at nusku:~/gi...n/r-cran-yaml-2.1.13/src% gcc -std=gnu99 -I/usr/share/R/include -I. -fpic -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -g -c implicit.c -o implicit.o
it compiles yaml.so without any error
-
this yaml.so is linked with
libR.so => /usr/lib/libR.so (0x00007f7614ddf000)
/usr/lib/x86_64-linux-gnu/libyaml-0.so.2.0.4 is _not_ linked with libR.so
- seems removing yaml sources before compiling, and shipping the thus build r-ified yaml.so is the best?
-
- R CMD INSTALL --no-clean-on-error
-
-
- MAKEFLAGS="LDFLAGS=-Wl,-z,relro" R CMD INSTALL -l /home/joostvb/git/r-cran/r-cran-yaml/debian/r-cran-yaml/usr/lib/R/site-library \
- --clean .
-
- (sid)joostvb at nusku:~/git/r-cran/r-cran-yaml% MAKEFLAGS="LDFLAGS=-Wl,-z,relro" R CMD INSTALL -l /home/joostvb/git/r-cran/r-cran-yaml/debian/r-cran-yaml/usr/lib/R/site-library --clean .
-
-
- (sid)joostvb at nusku:~/git/r-cran/r-cran-yaml% MAKEFLAGS="LDFLAGS=-Wl,-z,relro" R CMD INSTALL -l /home/joostvb/git/r-cran/r-cran-yaml/debian/r-cran-yaml/usr/lib/R/site-library --clean --no-clean-on-error .
-
- yields
-
debian/r-cran-yaml/usr/lib/R/site-library/yaml/libs/yaml.so*
- fixed? seems to work now....
-
-- Joost van Baal-Ilić <joostvb at debian.org> Wed, 23 Dec 2015 15:52:52 +0100
r-cran-yaml (2.1.13-2) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 4aca176..df38cde 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,13 @@ makeFlags="LDFLAGS=$(LDFLAGS)"
# use for debugging
# extraInstallFlags := --no-clean-on-error
-
+# or manually run
+# MAKEFLAGS="LDFLAGS=-Wl,-z,relro" R CMD INSTALL -l `pwd`/debian/r-cran-yaml/usr/lib/R/site-library --clean --no-clean-on-error .
+# and/or
+# cd src && gcc -std=gnu99 -I/usr/share/R/include -I. -fpic -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -g -c implicit.c -o implicit.o
+# and/or
+# cd src && gcc -std=gnu99 -shared -L/usr/lib/R/lib -Wl,-z,relro -o yaml.so implicit.o r-ext.o -L/usr/lib/R/lib -lR
+#
include /usr/share/R/debian/r-cran.mk
# see also /etc/R/Makeconf and /usr/lib/R/etc/Makeconf
@@ -23,6 +29,15 @@ include /usr/share/R/debian/r-cran.mk
# and https://cran.r-project.org/doc/manuals/R-admin.html#Customizing-package-compilation
#
# see http://pyyaml.org/wiki/LibYAML for libyaml upstream docs
+
+# upstream r-ext.h has:
+# #include "yaml.h"
+# #include "yaml_private.h"
+# should be
+# #include <yaml.h>
+# #include "yaml_private.h"
+# since libyaml-dev ships only /usr/include/yaml.h
+
pre-build::
test -d src,bak || cp -a src src,bak
rm -vf src/api.c src/dumper.c src/emitter.c src/loader.c src/parser.c src/reader.c src/scanner.c src/writer.c src/yaml.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-yaml.git
More information about the debian-science-commits
mailing list