Skip to content

Commit aee5558

Browse files
author
taca
committed
www/ruby-sassc: update to 2.3.0
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)
1 parent 41a2c45 commit aee5558

File tree

5 files changed

+33
-44
lines changed

5 files changed

+33
-44
lines changed

‎www/ruby-sassc/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.1 2019/10/01 15:34:50 ryoon Exp $
1+
# $NetBSD: Makefile,v 1.2 2020/05/17 16:25:42 taca Exp $
22

3-
DISTNAME= sassc-2.2.1
3+
DISTNAME= sassc-2.3.0
44
CATEGORIES= www
55

66
MAINTAINER= [email protected]

‎www/ruby-sassc/PLIST

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@comment $NetBSD: PLIST,v 1.1 2019/10/01 15:34:50 ryoon Exp $
1+
@comment $NetBSD: PLIST,v 1.2 2020/05/17 16:25:42 taca Exp $
22
${GEM_HOME}/cache/${GEM_NAME}.gem
33
${GEM_EXTSDIR}/gem.build_complete
44
${GEM_EXTSDIR}/sassc/libsass.${RUBY_DLEXT}
@@ -29,8 +29,11 @@ ${GEM_LIBDIR}/ext/libsass/src/ast2c.hpp
2929
${GEM_LIBDIR}/ext/libsass/src/ast_def_macros.hpp
3030
${GEM_LIBDIR}/ext/libsass/src/ast_fwd_decl.cpp
3131
${GEM_LIBDIR}/ext/libsass/src/ast_fwd_decl.hpp
32+
${GEM_LIBDIR}/ext/libsass/src/ast_helpers.hpp
3233
${GEM_LIBDIR}/ext/libsass/src/ast_sel_cmp.cpp
34+
${GEM_LIBDIR}/ext/libsass/src/ast_sel_super.cpp
3335
${GEM_LIBDIR}/ext/libsass/src/ast_sel_unify.cpp
36+
${GEM_LIBDIR}/ext/libsass/src/ast_sel_weave.cpp
3437
${GEM_LIBDIR}/ext/libsass/src/ast_selectors.cpp
3538
${GEM_LIBDIR}/ext/libsass/src/ast_selectors.hpp
3639
${GEM_LIBDIR}/ext/libsass/src/ast_supports.cpp
@@ -59,6 +62,7 @@ ${GEM_LIBDIR}/ext/libsass/src/context.cpp
5962
${GEM_LIBDIR}/ext/libsass/src/context.hpp
6063
${GEM_LIBDIR}/ext/libsass/src/cssize.cpp
6164
${GEM_LIBDIR}/ext/libsass/src/cssize.hpp
65+
${GEM_LIBDIR}/ext/libsass/src/dart_helpers.hpp
6266
${GEM_LIBDIR}/ext/libsass/src/debug.hpp
6367
${GEM_LIBDIR}/ext/libsass/src/debugger.hpp
6468
${GEM_LIBDIR}/ext/libsass/src/emitter.cpp
@@ -69,10 +73,13 @@ ${GEM_LIBDIR}/ext/libsass/src/error_handling.cpp
6973
${GEM_LIBDIR}/ext/libsass/src/error_handling.hpp
7074
${GEM_LIBDIR}/ext/libsass/src/eval.cpp
7175
${GEM_LIBDIR}/ext/libsass/src/eval.hpp
76+
${GEM_LIBDIR}/ext/libsass/src/eval_selectors.cpp
7277
${GEM_LIBDIR}/ext/libsass/src/expand.cpp
7378
${GEM_LIBDIR}/ext/libsass/src/expand.hpp
74-
${GEM_LIBDIR}/ext/libsass/src/extend.cpp
75-
${GEM_LIBDIR}/ext/libsass/src/extend.hpp
79+
${GEM_LIBDIR}/ext/libsass/src/extender.cpp
80+
${GEM_LIBDIR}/ext/libsass/src/extender.hpp
81+
${GEM_LIBDIR}/ext/libsass/src/extension.cpp
82+
${GEM_LIBDIR}/ext/libsass/src/extension.hpp
7683
${GEM_LIBDIR}/ext/libsass/src/file.cpp
7784
${GEM_LIBDIR}/ext/libsass/src/file.hpp
7885
${GEM_LIBDIR}/ext/libsass/src/fn_colors.cpp
@@ -103,16 +110,16 @@ ${GEM_LIBDIR}/ext/libsass/src/listize.hpp
103110
${GEM_LIBDIR}/ext/libsass/src/mapping.hpp
104111
${GEM_LIBDIR}/ext/libsass/src/memory/SharedPtr.cpp
105112
${GEM_LIBDIR}/ext/libsass/src/memory/SharedPtr.hpp
106-
${GEM_LIBDIR}/ext/libsass/src/node.cpp
107-
${GEM_LIBDIR}/ext/libsass/src/node.hpp
108113
${GEM_LIBDIR}/ext/libsass/src/operation.hpp
109114
${GEM_LIBDIR}/ext/libsass/src/operators.cpp
110115
${GEM_LIBDIR}/ext/libsass/src/operators.hpp
116+
${GEM_LIBDIR}/ext/libsass/src/ordered_map.hpp
111117
${GEM_LIBDIR}/ext/libsass/src/output.cpp
112118
${GEM_LIBDIR}/ext/libsass/src/output.hpp
113119
${GEM_LIBDIR}/ext/libsass/src/parser.cpp
114120
${GEM_LIBDIR}/ext/libsass/src/parser.hpp
115-
${GEM_LIBDIR}/ext/libsass/src/paths.hpp
121+
${GEM_LIBDIR}/ext/libsass/src/parser_selectors.cpp
122+
${GEM_LIBDIR}/ext/libsass/src/permutate.hpp
116123
${GEM_LIBDIR}/ext/libsass/src/plugins.cpp
117124
${GEM_LIBDIR}/ext/libsass/src/plugins.hpp
118125
${GEM_LIBDIR}/ext/libsass/src/position.cpp
@@ -128,14 +135,12 @@ ${GEM_LIBDIR}/ext/libsass/src/sass_context.cpp
128135
${GEM_LIBDIR}/ext/libsass/src/sass_context.hpp
129136
${GEM_LIBDIR}/ext/libsass/src/sass_functions.cpp
130137
${GEM_LIBDIR}/ext/libsass/src/sass_functions.hpp
131-
${GEM_LIBDIR}/ext/libsass/src/sass_util.cpp
132-
${GEM_LIBDIR}/ext/libsass/src/sass_util.hpp
133138
${GEM_LIBDIR}/ext/libsass/src/sass_values.cpp
134139
${GEM_LIBDIR}/ext/libsass/src/sass_values.hpp
135140
${GEM_LIBDIR}/ext/libsass/src/source_map.cpp
136141
${GEM_LIBDIR}/ext/libsass/src/source_map.hpp
137-
${GEM_LIBDIR}/ext/libsass/src/subset_map.cpp
138-
${GEM_LIBDIR}/ext/libsass/src/subset_map.hpp
142+
${GEM_LIBDIR}/ext/libsass/src/stylesheet.cpp
143+
${GEM_LIBDIR}/ext/libsass/src/stylesheet.hpp
139144
${GEM_LIBDIR}/ext/libsass/src/to_value.cpp
140145
${GEM_LIBDIR}/ext/libsass/src/to_value.hpp
141146
${GEM_LIBDIR}/ext/libsass/src/units.cpp

‎www/ruby-sassc/distinfo

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
$NetBSD: distinfo,v 1.2 2019/12/25 00:14:15 joerg Exp $
1+
$NetBSD: distinfo,v 1.3 2020/05/17 16:25:42 taca Exp $
22

3-
SHA1 (sassc-2.2.1.gem) = b496f902738b776c45bfda4e5331d46ab86f07a6
4-
RMD160 (sassc-2.2.1.gem) = 98f0f990019e1da97c2c37979c537e6e75b05d2b
5-
SHA512 (sassc-2.2.1.gem) = 728ad274363fd79aedee74fb6d4dbfc60f31b334e1a8054943ccf9cfa534fa3465abb00a2bd3020e198d287327058890411bb1983da6dc5dc3c4413b1936e2eb
6-
Size (sassc-2.2.1.gem) = 302080 bytes
7-
SHA1 (patch-ext_extconf.rb) = 541bee4de572121ba554be7975335102b699f0fa
3+
SHA1 (sassc-2.3.0.gem) = 53868c8146264e70c532ec5d683d014436eaf922
4+
RMD160 (sassc-2.3.0.gem) = 652acfcb675155f8aa77eac26b94b1ebaff986d2
5+
SHA512 (sassc-2.3.0.gem) = 370731adf12aeac11ed6568a60986a051f7f37e8b756a484a07ce8b13426bd81b33d8a87eb90d189298390cd4e465a7dc0786a1c7e2b86e1c77941284c80b900
6+
Size (sassc-2.3.0.gem) = 299008 bytes
7+
SHA1 (patch-ext_extconf.rb) = 57af96d62fa5d1faf154681b403242bfcfd0fa68
88
SHA1 (patch-ext_libsass_src_units.hpp) = 4673a9f289bd41c03f184e30ece3ee6e1b2efdf8
9-
SHA1 (patch-ext_libsass_src_util.hpp) = 29f7d12577af9b6b81306c55558b491b6ee16d69

‎www/ruby-sassc/patches/patch-ext_extconf.rb

+10-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
1-
$NetBSD: patch-ext_extconf.rb,v 1.2 2019/12/25 00:14:15 joerg Exp $
1+
$NetBSD: patch-ext_extconf.rb,v 1.3 2020/05/17 16:25:42 taca Exp $
22

33
Don't enable host-specific optimisations.
44
Don't enable LTO.
55

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

12-
-# Set to false when building binary gems
13-
-if enable_config('march-tune-native', true)
12+
-if enable_config('march-tune-native', false)
1413
- $CFLAGS << ' -march=native -mtune=native'
1514
- $CXXFLAGS << ' -march=native -mtune=native'
1615
-end
1716
-
18-
-if enable_config('lto', true)
17+
# darwin nix clang doesn't support lto
18+
# disable -lto flag for darwin + nix
19+
# see: https://github.com/sass/sassc-ruby/issues/148
20+
enable_lto_by_default = (Gem::Platform.local.os == "darwin" && !ENV['NIX_CC'].nil?)
21+
22+
-if enable_config('lto', enable_lto_by_default)
1923
- $CFLAGS << ' -flto'
2024
- $CXXFLAGS << ' -flto'
2125
- $LDFLAGS << ' -flto'

‎www/ruby-sassc/patches/patch-ext_libsass_src_util.hpp

-19
This file was deleted.

0 commit comments

Comments
 (0)