Skip to content

Commit

Permalink
Fix for CRAN
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Jan 31, 2020
1 parent b56d57c commit 25ea639
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: RAppArmor
Type: Package
Title: Bindings to AppArmor and Security Related Linux Tools
Version: 3.2
Version: 3.2.1
Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"),
email = "jeroen@berkeley.edu", comment = c(ORCID = "0000-0002-4035-0289"))
Description: Bindings to kernel methods for enforcing security restrictions.
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
3.2.1
- Fix for CRAN: do not use CPP in configure

3.2
- Move unix from Imports to Depends because many old examples from the paper
assume that the rlimit_ functions are attached when using RAppArmor.
Expand Down
4 changes: 2 additions & 2 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ echo "Using PKG_CFLAGS=$PKG_CFLAGS"
echo "Using PKG_LIBS=$PKG_LIBS"

# Find compiler
CPP=$(${R_HOME}/bin/R CMD config CPP)
CC=$(${R_HOME}/bin/R CMD config CC)
CFLAGS=$(${R_HOME}/bin/R CMD config CFLAGS)
CPPFLAGS=$(${R_HOME}/bin/R CMD config CPPFLAGS)

# Test for header
echo "#include $PKG_TEST_HEADER" | ${CPP} ${CPPFLAGS} ${PKG_CFLAGS} ${CFLAGS} -xc - >/dev/null 2>&1
echo "#include $PKG_TEST_HEADER" | ${CC} -E ${CPPFLAGS} ${PKG_CFLAGS} ${CFLAGS} -xc - >/dev/null 2>&1

# Customize the error
if [ $? -ne 0 ]; then
Expand Down

0 comments on commit 25ea639

Please sign in to comment.