diff --git a/Changelog.md b/Changelog.md --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,8 @@ +### 0.5.1.2 + +- Parse *ldd* outputs of older formats where the separator may occur between the + library and the address like in *linux-vdso.so.1 => (0x00007fffd33f2000)*. + ### 0.5.1.1 - Collect *libffi* library unconditionally. diff --git a/NgxExport/Distribution.hs b/NgxExport/Distribution.hs --- a/NgxExport/Distribution.hs +++ b/NgxExport/Distribution.hs @@ -155,18 +155,18 @@ -- > [1 of 2] Compiling NgxDistributionTest ( ngx_distribution_test.hs, ngx_distribution_test.o ) -- > [2 of 2] Linking ngx_distribution_test.so -- > ---> Collecting libraries --- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSngx-export-1.7.5-FKKGVRZDmRmCwc8075DbYl-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSngx-export-1.7.5-FKKGVRZDmRmCwc8075DbYl-ghc9.6.2.so --- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSunix-2.8.1.0-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSunix-2.8.1.0-ghc9.6.2.so --- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSmonad-loops-0.4.3-JOAJ0hfyQmbETqIRZyULfB-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSmonad-loops-0.4.3-JOAJ0hfyQmbETqIRZyULfB-ghc9.6.2.so --- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSasync-2.2.4-Bps1tT28WAgAP1V90ox12z-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSasync-2.2.4-Bps1tT28WAgAP1V90ox12z-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSOneTuple-0.4.1.1-GTlScb3X0Hn7Y4A5VTBpq8-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSOneTuple-0.4.1.1-GTlScb3X0Hn7Y4A5VTBpq8-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSQuickCheck-2.14.3-FxURKqK1tk15J8arEBmUtc-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSQuickCheck-2.14.3-FxURKqK1tk15J8arEBmUtc-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSStateVar-1.2.2-F3B0sJlZ41353sDhwwFm1B-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSStateVar-1.2.2-F3B0sJlZ41353sDhwwFm1B-ghc9.6.2.so -- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSaeson-2.2.0.0-KcH800TS6us8tZ6AZDtIQh-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSaeson-2.2.0.0-KcH800TS6us8tZ6AZDtIQh-ghc9.6.2.so --- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so +-- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSarray-0.5.5.0-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSarray-0.5.5.0-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSassoc-1.1-5sFQqIOvFZQJX5kdLbEWB9-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSassoc-1.1-5sFQqIOvFZQJX5kdLbEWB9-ghc9.6.2.so -- > -- > ... -- > --- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSghc-bignum-1.3-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSghc-bignum-1.3-ghc9.6.2.so --- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSghc-prim-0.10.0-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSghc-prim-0.10.0-ghc9.6.2.so --- > /usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2/libHSrts-1.0.2_thr-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSrts-1.0.2_thr-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSvector-stream-0.1.0.0-Kd51wsO6Y2s1Z8znT4c6B5-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSvector-stream-0.1.0.0-Kd51wsO6Y2s1Z8znT4c6B5-ghc9.6.2.so +-- > /home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so -> x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so +-- > /lib64/libffi.so.8 -> x86_64-linux-ghc-9.6.2/libffi.so.8 -- > -- > ---> Patching ngx_distribution_test.so -- > /var/lib/nginx/x86_64-linux-ghc-9.6.2:/home/lyokha/.cabal/lib/x86_64-linux-ghc-9.6.2:/usr/lib64/ghc-9.6.2/lib/../lib/x86_64-linux-ghc-9.6.2 @@ -174,16 +174,16 @@ -- > ---> Archiving artifacts -- > ngx_distribution_test.so -- > x86_64-linux-ghc-9.6.2/ --- > x86_64-linux-ghc-9.6.2/libHSngx-export-1.7.5-FKKGVRZDmRmCwc8075DbYl-ghc9.6.2.so --- > x86_64-linux-ghc-9.6.2/libHSunix-2.8.1.0-ghc9.6.2.so --- > x86_64-linux-ghc-9.6.2/libHSmonad-loops-0.4.3-JOAJ0hfyQmbETqIRZyULfB-ghc9.6.2.so --- > x86_64-linux-ghc-9.6.2/libHSasync-2.2.4-Bps1tT28WAgAP1V90ox12z-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSOneTuple-0.4.1.1-GTlScb3X0Hn7Y4A5VTBpq8-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSQuickCheck-2.14.3-FxURKqK1tk15J8arEBmUtc-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSStateVar-1.2.2-F3B0sJlZ41353sDhwwFm1B-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSaeson-2.2.0.0-KcH800TS6us8tZ6AZDtIQh-ghc9.6.2.so -- > -- > ... -- > --- > x86_64-linux-ghc-9.6.2/libHSghc-bignum-1.3-ghc9.6.2.so --- > x86_64-linux-ghc-9.6.2/libHSghc-prim-0.10.0-ghc9.6.2.so --- > x86_64-linux-ghc-9.6.2/libHSrts-1.0.2_thr-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSvector-stream-0.1.0.0-Kd51wsO6Y2s1Z8znT4c6B5-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libHSwitherable-0.4.2-KGoJH5wjsMLKLjx4iVJYPg-ghc9.6.2.so +-- > x86_64-linux-ghc-9.6.2/libffi.so.8 -- -- Notes about the value of /--ghc-options/ in command /cabal v1-build/. -- @@ -257,10 +257,10 @@ -- Command /nhm-tool deps/ builds around the code of the /cabal-plan/ library. -- After running this, four lines looking similar to -- --- > package-id aeson-2.1.0.0-9b19e87ee2a82567866c50e13806427068fd4bcc78cedb01ecad7389791f6761 --- > package-id base-4.17.0.0 --- > package-id bytestring-0.11.3.1 --- > package-id ngx-export-1.7.5-17b83e3ac354cc52614227ba662f8c23a8ddd4e08f2a1a02b0d6b51b2dd849ea +-- > package-id aeson-2.2.0.0-711db3f5b99af756f1eae54020c04616c024ecab6013b0b2140b60e4c06a6e9d +-- > package-id base-4.18.0.0 +-- > package-id bytestring-0.11.4.0 +-- > package-id ngx-export-1.7.7.1-7f7a3d21f396899b6466d425218188ba097f7cc49638994748bb4e4828d9e354 -- -- will appear at the end of file /.ghc.environment.x86_64-linux-9.6.2/. This -- shall expose the four dependent packages at the next step. @@ -307,7 +307,7 @@ -- With all the building approaches shown above, the following list of drawbacks -- must be taken into account. -- --- - Utility /nhm-tool/ collects only libraries prefixed with /libHS/ and +-- - Utility /nhm-tool/ collects only libraries prefixed with /libHS/ or -- /libffi.so/, -- - clean commands such as /cabal v1-clean/ do not delete build artifacts in -- the current working directory, @@ -391,7 +391,7 @@ -- libraries in a /tar.gz/ file. -- -- All steps are performed by utility /nhm-tool/. It collects all libraries --- with prefix /libHS/ and /libffi.so/ from the list returned by command /ldd/ +-- with prefixes /libHS/ or /libffi.so/ from the list returned by command /ldd/ -- applied to the shared library. patchAndCollectDependentLibs :: Verbosity -- ^ Verbosity level -> FilePath -- ^ Path to the library diff --git a/ngx-export-distribution.cabal b/ngx-export-distribution.cabal --- a/ngx-export-distribution.cabal +++ b/ngx-export-distribution.cabal @@ -1,5 +1,5 @@ name: ngx-export-distribution -version: 0.5.1.1 +version: 0.5.1.2 synopsis: Build custom libraries for Nginx haskell module description: Build custom libraries for . diff --git a/nhm-tool.hs b/nhm-tool.hs --- a/nhm-tool.hs +++ b/nhm-tool.hs @@ -358,10 +358,8 @@ <|> Nothing <$ string "not found" ) ) - -- FIXME: in some documents, vdso record has an arrow in the middle - -- linux-vdso.so.1 => (0x00007fffd33f2000) - -- this format is not supported here, not sure if it should be. - <|> (`LibOther` Nothing) <$> right + <|> try ((`LibOther` Nothing) <$> right) + <|> (`LibOther` Nothing) <$> manyTill anyChar' (sep *> addr *> newline) ) where toLddRec lib | "libHS" `isPrefixOf` lib = LibHS lib | "libffi.so" `isPrefixOf` lib = LibFFI lib