Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move CMake's staging directory outside OUTPUT_DIR #1044

Merged
merged 1 commit into from
Feb 9, 2020

Conversation

NiLuJe
Copy link
Member

@NiLuJe NiLuJe commented Feb 9, 2020

Otherwise, we're picking it up in the final packages

We've been shipping extra bits of jpeg-turbo & zsync2 because of that,
which explains why the tarball's size has suddenly ballooned...


This change is Reviewable

Otherwise, we're picking it up in the final packages

We've been shipping extra bits of jpeg-turbo & zsync2 because of that,
which explains why the tarball's size has suddenly ballooned...
@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 9, 2020

Randomly noticed this when testing a vanilla install from scratch the other day.

This got worse w/ zsync2 because of the two unstripped 2MB binaries (static C++ :/), but we've been shipping's jpeg-turbo's lib, bin & share folders for quite a while.

I hadn't noticed it on my end, because I'm using my own CMakeCross file, which already puts the staging directory in my own separate staging directory ;).

@NiLuJe
Copy link
Member Author

NiLuJe commented Feb 9, 2020

Specifically:

Build_KOBO
├── bin
│   ├── cjpeg
│   ├── djpeg
│   ├── jpegtran
│   ├── rdjpgcom
│   ├── tjbench
│   ├── wrjpgcom
│   ├── zsync2
│   └── zsyncmake2
├── lib
│   └── static
│       └── libzsync2.a
└── share
    ├── doc
    │   └── libjpeg-turbo
    │       ├── example.txt
    │       ├── libjpeg.txt
    │       ├── LICENSE.md
    │       ├── README.ijg
    │       ├── README.md
    │       ├── structure.txt
    │       ├── tjexample.c
    │       ├── usage.txt
    │       └── wizard.txt
    └── man
        └── man1
            ├── cjpeg.1
            ├── djpeg.1
            ├── jpegtran.1
            ├── rdjpgcom.1
            └── wrjpgcom.1

8 directories, 23 files
5.5M    Build_KOBO

@NiLuJe NiLuJe mentioned this pull request Feb 9, 2020
Copy link
Member

@Frenzie Frenzie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops :-D

@NiLuJe NiLuJe merged commit d12a54e into koreader:master Feb 9, 2020
NiLuJe added a commit to NiLuJe/koreader that referenced this pull request Feb 9, 2020
* Make sure HW dithering is never used on unsupported Kindles
  (koreader/koreader-base#1043)
* Stop shipping 6MB of extra crap
  (koreader/koreader-base#1044)
NiLuJe added a commit to koreader/koreader that referenced this pull request Feb 9, 2020
* Make sure HW dithering is never used on unsupported Kindles
  (koreader/koreader-base#1043)
* Stop shipping 6MB of extra crap
  (koreader/koreader-base#1044)
mwoz123 pushed a commit to mwoz123/koreader that referenced this pull request Mar 29, 2020
* Make sure HW dithering is never used on unsupported Kindles
  (koreader/koreader-base#1043)
* Stop shipping 6MB of extra crap
  (koreader/koreader-base#1044)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants