Page MenuHomeFreeBSD
Differential D11615

math/R: set SONAME for some R libraries
ClosedPublic
Actions

Authored by jrm on Jul 17 2017, 1:17 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 12, 6:21 PM
Unknown Object (File)
Sun, Feb 23, 4:00 PM
Unknown Object (File)
Sun, Feb 23, 7:31 AM
Unknown Object (File)
Sat, Feb 22, 5:37 PM
Unknown Object (File)
Sat, Feb 22, 4:04 PM
Unknown Object (File)
Sat, Feb 22, 9:07 AM
Unknown Object (File)
Sat, Feb 22, 7:43 AM
Unknown Object (File)
Feb 18 2025, 11:56 AM
View All 93 Files
Subscribers
mat
pawel

Details

Reviewers
dbn
pawel
Commits
rP446199: math/R: set SONAME for libraries under lib/R/lib
Summary

These are some suggested tweaks to the patch for math/R submitted by pawel@
in Bug 219776.

  • Add links in ${PREFIX}/lib for the libraries that we are using as system libraries.
  • Set LIBVER to ${PORTVERSION:R}, i.e., R's major_version.minor_version

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

jrm created this revision.Jul 17 2017, 1:17 AM
Herald added a subscriber: mat. · View Herald TranscriptJul 17 2017, 1:17 AM
Harbormaster completed remote builds in B10517: Diff 30848.Jul 17 2017, 1:17 AM
jrm updated this revision to Diff 30850.Jul 17 2017, 1:58 AM

Minor tweak to how the links in ${PREFIX}/lib are created.

Harbormaster completed remote builds in B10519: Diff 30850.Jul 17 2017, 1:58 AM
pawel added a subscriber: pawel.Jul 17 2017, 8:02 AM
mat added inline comments.Jul 17 2017, 1:27 PM
math/R/Makefile
149–159 ↗(On Diff #30850)

I wonder if this should not be replaced by

USE_LDCONFIG= ${PREFIX}/lib/R/lib
jrm added inline comments.Jul 17 2017, 1:37 PM
math/R/Makefile
149–159 ↗(On Diff #30850)

Upstream makes a big deal about the libraries under lib/R/lib/ not being system libraries. If you are interested in the gory details, this thread spells it out: https://stat.ethz.ch/pipermail/r-devel/2016-November/073397.html. I thought creating links under lib/ would make it clear that we are intending to make these system libraries.

jrm added a reviewer: pawel.Jul 17 2017, 1:38 PM
mat added inline comments.Jul 17 2017, 1:59 PM
math/R/Makefile
149–159 ↗(On Diff #30850)

Mmmmm, but does any port actually needs this ?

pawel added inline comments.Jul 17 2017, 3:56 PM
math/R/Makefile
149–159 ↗(On Diff #30850)

I find this additional links messy and fail to see benefits. Interested consumers can get correct linker flags from pkg-config:

% pkg-config --libs libR
-Wl,--export-dynamic -L/usr/local/lib -Wl,-rpath=/usr/local/lib/gcc5 -L/usr/local/lib/gcc5 -B/usr/local/bin -fstack-protector -L/usr/local/lib/R/lib -lR

So my vote here goes for USE_LDCONFIG= ${PREFIX}/lib/R/lib like in my initial patch.

jrm updated this revision to Diff 30886.Jul 17 2017, 7:16 PM

Do not create links to lib/R/lib/* in lib/.

Harbormaster completed remote builds in B10537: Diff 30886.Jul 17 2017, 7:16 PM
Closed by commit rP446199: math/R: set SONAME for libraries under lib/R/lib (authored by jrm). · Explain WhyJul 19 2017, 2:20 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30954

View Options

head/math/R/Makefile

Show All 25 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _LINUXKPI_LINUX_DEBUGFS_H_ #ifndef _LINUXKPI_LINUX_DEBUGFS_H_
#define _LINUXKPI_LINUX_DEBUGFS_H_ #define _LINUXKPI_LINUX_DEBUGFS_H_
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/module.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/types.h> #include <linux/types.h>
void debugfs_remove(struct dentry *dentry); MALLOC_DECLARE(M_DFSINT);
struct debugfs_reg32 {
char *name;
unsigned long offset;
};
struct debugfs_regset32 {
const struct debugfs_reg32 *regs;
int nregs;
};
struct dentry *debugfs_create_file(const char *name, umode_t mode, struct dentry *debugfs_create_file(const char *name, umode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,
const struct file_operations *fops); const struct file_operations *fops);
struct dentry *debugfs_create_file_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops);
struct dentry *debugfs_create_mode_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops,
const struct file_operations *fops_ro,
const struct file_operations *fops_wo);
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent); struct dentry *debugfs_create_dir(const char *name, struct dentry *parent);
struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
const char *dest); const char *dest);
void debugfs_remove(struct dentry *dentry);
void debugfs_remove_recursive(struct dentry *dentry); void debugfs_remove_recursive(struct dentry *dentry);
#endif #define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \
DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt)
void debugfs_create_bool(const char *name, umode_t mode, struct dentry *parent,
bool *value);
void debugfs_create_ulong(const char *name, umode_t mode, struct dentry *parent,
unsigned long *value);
#endif /* _LINUXKPI_LINUX_DEBUGFS_H_ */
hselaskyUnsubmitted
Done
Inline Actions

BSD style: All return values should be wrapped by ()'s.

hselasky: BSD style: All return values should be wrapped by ()'s.
jfreeAuthorUnsubmitted
Done
Inline Actions

Got it. I will change that! :)

jfree: Got it. I will change that! :)
View Options

head/math/R/files/patch-src_extra_blas_Makefile.in

Show All 25 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _LINUXKPI_LINUX_DEBUGFS_H_ #ifndef _LINUXKPI_LINUX_DEBUGFS_H_
#define _LINUXKPI_LINUX_DEBUGFS_H_ #define _LINUXKPI_LINUX_DEBUGFS_H_
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/module.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/types.h> #include <linux/types.h>
void debugfs_remove(struct dentry *dentry); MALLOC_DECLARE(M_DFSINT);
struct debugfs_reg32 {
char *name;
unsigned long offset;
};
struct debugfs_regset32 {
const struct debugfs_reg32 *regs;
int nregs;
};
struct dentry *debugfs_create_file(const char *name, umode_t mode, struct dentry *debugfs_create_file(const char *name, umode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,
const struct file_operations *fops); const struct file_operations *fops);
struct dentry *debugfs_create_file_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops);
struct dentry *debugfs_create_mode_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops,
const struct file_operations *fops_ro,
const struct file_operations *fops_wo);
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent); struct dentry *debugfs_create_dir(const char *name, struct dentry *parent);
struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
const char *dest); const char *dest);
void debugfs_remove(struct dentry *dentry);
void debugfs_remove_recursive(struct dentry *dentry); void debugfs_remove_recursive(struct dentry *dentry);
#endif #define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \
DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt)
void debugfs_create_bool(const char *name, umode_t mode, struct dentry *parent,
bool *value);
void debugfs_create_ulong(const char *name, umode_t mode, struct dentry *parent,
unsigned long *value);
#endif /* _LINUXKPI_LINUX_DEBUGFS_H_ */
hselaskyUnsubmitted
Done
Inline Actions

BSD style: All return values should be wrapped by ()'s.

hselasky: BSD style: All return values should be wrapped by ()'s.
jfreeAuthorUnsubmitted
Done
Inline Actions

Got it. I will change that! :)

jfree: Got it. I will change that! :)
View Options

head/math/R/files/patch-src_main_Makefile.in

Show All 25 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _LINUXKPI_LINUX_DEBUGFS_H_ #ifndef _LINUXKPI_LINUX_DEBUGFS_H_
#define _LINUXKPI_LINUX_DEBUGFS_H_ #define _LINUXKPI_LINUX_DEBUGFS_H_
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/module.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/types.h> #include <linux/types.h>
void debugfs_remove(struct dentry *dentry); MALLOC_DECLARE(M_DFSINT);
struct debugfs_reg32 {
char *name;
unsigned long offset;
};
struct debugfs_regset32 {
const struct debugfs_reg32 *regs;
int nregs;
};
struct dentry *debugfs_create_file(const char *name, umode_t mode, struct dentry *debugfs_create_file(const char *name, umode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,
const struct file_operations *fops); const struct file_operations *fops);
struct dentry *debugfs_create_file_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops);
struct dentry *debugfs_create_mode_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops,
const struct file_operations *fops_ro,
const struct file_operations *fops_wo);
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent); struct dentry *debugfs_create_dir(const char *name, struct dentry *parent);
struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
const char *dest); const char *dest);
void debugfs_remove(struct dentry *dentry);
void debugfs_remove_recursive(struct dentry *dentry); void debugfs_remove_recursive(struct dentry *dentry);
#endif #define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \
DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt)
void debugfs_create_bool(const char *name, umode_t mode, struct dentry *parent,
bool *value);
void debugfs_create_ulong(const char *name, umode_t mode, struct dentry *parent,
unsigned long *value);
#endif /* _LINUXKPI_LINUX_DEBUGFS_H_ */
hselaskyUnsubmitted
Done
Inline Actions

BSD style: All return values should be wrapped by ()'s.

hselasky: BSD style: All return values should be wrapped by ()'s.
jfreeAuthorUnsubmitted
Done
Inline Actions

Got it. I will change that! :)

jfree: Got it. I will change that! :)
View Options

head/math/R/files/patch-src_modules_lapack_Makefile.in

Show All 25 Lines
* *
* $FreeBSD$ * $FreeBSD$
*/ */
#ifndef _LINUXKPI_LINUX_DEBUGFS_H_ #ifndef _LINUXKPI_LINUX_DEBUGFS_H_
#define _LINUXKPI_LINUX_DEBUGFS_H_ #define _LINUXKPI_LINUX_DEBUGFS_H_
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/module.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/types.h> #include <linux/types.h>
void debugfs_remove(struct dentry *dentry); MALLOC_DECLARE(M_DFSINT);
struct debugfs_reg32 {
char *name;
unsigned long offset;
};
struct debugfs_regset32 {
const struct debugfs_reg32 *regs;
int nregs;
};
struct dentry *debugfs_create_file(const char *name, umode_t mode, struct dentry *debugfs_create_file(const char *name, umode_t mode,
struct dentry *parent, void *data, struct dentry *parent, void *data,
const struct file_operations *fops); const struct file_operations *fops);
struct dentry *debugfs_create_file_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops);
struct dentry *debugfs_create_mode_unsafe(const char *name, umode_t mode,
struct dentry *parent, void *data,
const struct file_operations *fops,
const struct file_operations *fops_ro,
const struct file_operations *fops_wo);
struct dentry *debugfs_create_dir(const char *name, struct dentry *parent); struct dentry *debugfs_create_dir(const char *name, struct dentry *parent);
struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent, struct dentry *debugfs_create_symlink(const char *name, struct dentry *parent,
const char *dest); const char *dest);
void debugfs_remove(struct dentry *dentry);
void debugfs_remove_recursive(struct dentry *dentry); void debugfs_remove_recursive(struct dentry *dentry);
#endif #define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \
DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt)
void debugfs_create_bool(const char *name, umode_t mode, struct dentry *parent,
bool *value);
void debugfs_create_ulong(const char *name, umode_t mode, struct dentry *parent,
unsigned long *value);
#endif /* _LINUXKPI_LINUX_DEBUGFS_H_ */
hselaskyUnsubmitted
Done
Inline Actions

BSD style: All return values should be wrapped by ()'s.

hselasky: BSD style: All return values should be wrapped by ()'s.
jfreeAuthorUnsubmitted
Done
Inline Actions

Got it. I will change that! :)

jfree: Got it. I will change that! :)
View Options

head/math/R/pkg-plist

Loading...