Skip to content

Commit

Permalink
www/ruby-sassc: update to 2.3.0
Browse files Browse the repository at this point in the history 
Update to ruby-sassc to 2.3.0.


- **2.3.0**
  - [Fix rake gem:native task](sass/sassc-ruby#196)
  - [disable lto flag for darwin + nix](sass/sassc-ruby#166)
  - [Sort input file list](sass/sassc-ruby#178)
  - [Set appropriate encoding for source_map](sass/sassc-ruby#152)
  - [allow passing functions directly](sass/sassc-ruby#162)
  - [always dispose data context](sass/sassc-ruby#161)
  - [Update libsass to 3.6.3](sass/sassc-ruby#164)
  - [Restore strip symbols](sass/sassc-ruby#184)
  - [Default --march-tune-native to false](sass/sassc-ruby#158)
  - [Fix compile issue on Mac OS X](sass/sassc-ruby#174)
  - [Test on TruffleRuby in TravisCI](sass/sassc-ruby#171)
  - [Use RbConfig::MAKEFILE_CONFIG['DLEXT'] instead of hardcoding extensions](sass/sassc-ruby#173)
  • Loading branch information
taca committed May 17, 2020
1 parent 41a2c45 commit aee5558
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 44 deletions.
4 changes: 2 additions & 2 deletions www/ruby-sassc/Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1 2019/10/01 15:34:50 ryoon Exp $
# $NetBSD: Makefile,v 1.2 2020/05/17 16:25:42 taca Exp $

DISTNAME= sassc-2.2.1
DISTNAME= sassc-2.3.0
CATEGORIES= www

MAINTAINER= pkgsrc-users@NetBSD.org
Expand Down
25 changes: 15 additions & 10 deletions www/ruby-sassc/PLIST
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2019/10/01 15:34:50 ryoon Exp $
@comment $NetBSD: PLIST,v 1.2 2020/05/17 16:25:42 taca Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/sassc/libsass.${RUBY_DLEXT}
Expand Down Expand Up @@ -29,8 +29,11 @@ ${GEM_LIBDIR}/ext/libsass/src/ast2c.hpp
${GEM_LIBDIR}/ext/libsass/src/ast_def_macros.hpp
${GEM_LIBDIR}/ext/libsass/src/ast_fwd_decl.cpp
${GEM_LIBDIR}/ext/libsass/src/ast_fwd_decl.hpp
${GEM_LIBDIR}/ext/libsass/src/ast_helpers.hpp
${GEM_LIBDIR}/ext/libsass/src/ast_sel_cmp.cpp
${GEM_LIBDIR}/ext/libsass/src/ast_sel_super.cpp
${GEM_LIBDIR}/ext/libsass/src/ast_sel_unify.cpp
${GEM_LIBDIR}/ext/libsass/src/ast_sel_weave.cpp
${GEM_LIBDIR}/ext/libsass/src/ast_selectors.cpp
${GEM_LIBDIR}/ext/libsass/src/ast_selectors.hpp
${GEM_LIBDIR}/ext/libsass/src/ast_supports.cpp
Expand Down Expand Up @@ -59,6 +62,7 @@ ${GEM_LIBDIR}/ext/libsass/src/context.cpp
${GEM_LIBDIR}/ext/libsass/src/context.hpp
${GEM_LIBDIR}/ext/libsass/src/cssize.cpp
${GEM_LIBDIR}/ext/libsass/src/cssize.hpp
${GEM_LIBDIR}/ext/libsass/src/dart_helpers.hpp
${GEM_LIBDIR}/ext/libsass/src/debug.hpp
${GEM_LIBDIR}/ext/libsass/src/debugger.hpp
${GEM_LIBDIR}/ext/libsass/src/emitter.cpp
Expand All @@ -69,10 +73,13 @@ ${GEM_LIBDIR}/ext/libsass/src/error_handling.cpp
${GEM_LIBDIR}/ext/libsass/src/error_handling.hpp
${GEM_LIBDIR}/ext/libsass/src/eval.cpp
${GEM_LIBDIR}/ext/libsass/src/eval.hpp
${GEM_LIBDIR}/ext/libsass/src/eval_selectors.cpp
${GEM_LIBDIR}/ext/libsass/src/expand.cpp
${GEM_LIBDIR}/ext/libsass/src/expand.hpp
${GEM_LIBDIR}/ext/libsass/src/extend.cpp
${GEM_LIBDIR}/ext/libsass/src/extend.hpp
${GEM_LIBDIR}/ext/libsass/src/extender.cpp
${GEM_LIBDIR}/ext/libsass/src/extender.hpp
${GEM_LIBDIR}/ext/libsass/src/extension.cpp
${GEM_LIBDIR}/ext/libsass/src/extension.hpp
${GEM_LIBDIR}/ext/libsass/src/file.cpp
${GEM_LIBDIR}/ext/libsass/src/file.hpp
${GEM_LIBDIR}/ext/libsass/src/fn_colors.cpp
Expand Down Expand Up @@ -103,16 +110,16 @@ ${GEM_LIBDIR}/ext/libsass/src/listize.hpp
${GEM_LIBDIR}/ext/libsass/src/mapping.hpp
${GEM_LIBDIR}/ext/libsass/src/memory/SharedPtr.cpp
${GEM_LIBDIR}/ext/libsass/src/memory/SharedPtr.hpp
${GEM_LIBDIR}/ext/libsass/src/node.cpp
${GEM_LIBDIR}/ext/libsass/src/node.hpp
${GEM_LIBDIR}/ext/libsass/src/operation.hpp
${GEM_LIBDIR}/ext/libsass/src/operators.cpp
${GEM_LIBDIR}/ext/libsass/src/operators.hpp
${GEM_LIBDIR}/ext/libsass/src/ordered_map.hpp
${GEM_LIBDIR}/ext/libsass/src/output.cpp
${GEM_LIBDIR}/ext/libsass/src/output.hpp
${GEM_LIBDIR}/ext/libsass/src/parser.cpp
${GEM_LIBDIR}/ext/libsass/src/parser.hpp
${GEM_LIBDIR}/ext/libsass/src/paths.hpp
${GEM_LIBDIR}/ext/libsass/src/parser_selectors.cpp
${GEM_LIBDIR}/ext/libsass/src/permutate.hpp
${GEM_LIBDIR}/ext/libsass/src/plugins.cpp
${GEM_LIBDIR}/ext/libsass/src/plugins.hpp
${GEM_LIBDIR}/ext/libsass/src/position.cpp
Expand All @@ -128,14 +135,12 @@ ${GEM_LIBDIR}/ext/libsass/src/sass_context.cpp
${GEM_LIBDIR}/ext/libsass/src/sass_context.hpp
${GEM_LIBDIR}/ext/libsass/src/sass_functions.cpp
${GEM_LIBDIR}/ext/libsass/src/sass_functions.hpp
${GEM_LIBDIR}/ext/libsass/src/sass_util.cpp
${GEM_LIBDIR}/ext/libsass/src/sass_util.hpp
${GEM_LIBDIR}/ext/libsass/src/sass_values.cpp
${GEM_LIBDIR}/ext/libsass/src/sass_values.hpp
${GEM_LIBDIR}/ext/libsass/src/source_map.cpp
${GEM_LIBDIR}/ext/libsass/src/source_map.hpp
${GEM_LIBDIR}/ext/libsass/src/subset_map.cpp
${GEM_LIBDIR}/ext/libsass/src/subset_map.hpp
${GEM_LIBDIR}/ext/libsass/src/stylesheet.cpp
${GEM_LIBDIR}/ext/libsass/src/stylesheet.hpp
${GEM_LIBDIR}/ext/libsass/src/to_value.cpp
${GEM_LIBDIR}/ext/libsass/src/to_value.hpp
${GEM_LIBDIR}/ext/libsass/src/units.cpp
Expand Down
13 changes: 6 additions & 7 deletions www/ruby-sassc/distinfo
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
$NetBSD: distinfo,v 1.2 2019/12/25 00:14:15 joerg Exp $
$NetBSD: distinfo,v 1.3 2020/05/17 16:25:42 taca Exp $

SHA1 (sassc-2.2.1.gem) = b496f902738b776c45bfda4e5331d46ab86f07a6
RMD160 (sassc-2.2.1.gem) = 98f0f990019e1da97c2c37979c537e6e75b05d2b
SHA512 (sassc-2.2.1.gem) = 728ad274363fd79aedee74fb6d4dbfc60f31b334e1a8054943ccf9cfa534fa3465abb00a2bd3020e198d287327058890411bb1983da6dc5dc3c4413b1936e2eb
Size (sassc-2.2.1.gem) = 302080 bytes
SHA1 (patch-ext_extconf.rb) = 541bee4de572121ba554be7975335102b699f0fa
SHA1 (sassc-2.3.0.gem) = 53868c8146264e70c532ec5d683d014436eaf922
RMD160 (sassc-2.3.0.gem) = 652acfcb675155f8aa77eac26b94b1ebaff986d2
SHA512 (sassc-2.3.0.gem) = 370731adf12aeac11ed6568a60986a051f7f37e8b756a484a07ce8b13426bd81b33d8a87eb90d189298390cd4e465a7dc0786a1c7e2b86e1c77941284c80b900
Size (sassc-2.3.0.gem) = 299008 bytes
SHA1 (patch-ext_extconf.rb) = 57af96d62fa5d1faf154681b403242bfcfd0fa68
SHA1 (patch-ext_libsass_src_units.hpp) = 4673a9f289bd41c03f184e30ece3ee6e1b2efdf8
SHA1 (patch-ext_libsass_src_util.hpp) = 29f7d12577af9b6b81306c55558b491b6ee16d69
16 changes: 10 additions & 6 deletions www/ruby-sassc/patches/patch-ext_extconf.rb
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
$NetBSD: patch-ext_extconf.rb,v 1.2 2019/12/25 00:14:15 joerg Exp $
$NetBSD: patch-ext_extconf.rb,v 1.3 2020/05/17 16:25:42 taca Exp $

Don't enable host-specific optimisations.
Don't enable LTO.

--- ext/extconf.rb.orig 2019-09-27 13:30:47.910318310 +0000
--- ext/extconf.rb.orig 2020-04-25 02:39:24.087193330 +0000
+++ ext/extconf.rb
@@ -19,18 +19,6 @@ if enable_config('static-stdlib', false)
@@ -19,22 +19,11 @@ if enable_config('static-stdlib', false)
$LDFLAGS << ' -static-libgcc -static-libstdc++'
end

-# Set to false when building binary gems
-if enable_config('march-tune-native', true)
-if enable_config('march-tune-native', false)
- $CFLAGS << ' -march=native -mtune=native'
- $CXXFLAGS << ' -march=native -mtune=native'
-end
-
-if enable_config('lto', true)
# darwin nix clang doesn't support lto
# disable -lto flag for darwin + nix
# see: https://github.com/sass/sassc-ruby/issues/148
enable_lto_by_default = (Gem::Platform.local.os == "darwin" && !ENV['NIX_CC'].nil?)

This comment has been minimized.

Sign in to view

Copy link
@lrworth

lrworth May 20, 2020

sass/sassc-ruby#192 This line has the opposite logic to what the comment describes - LTO is only ever enabled when on Darwin running Nix clang.

-if enable_config('lto', enable_lto_by_default)
- $CFLAGS << ' -flto'
- $CXXFLAGS << ' -flto'
- $LDFLAGS << ' -flto'
Expand Down
19 changes: 0 additions & 19 deletions www/ruby-sassc/patches/patch-ext_libsass_src_util.hpp
View file

This file was deleted.

0 comments on commit aee5558

Please sign in to comment.